diff options
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/test-cgroup-util.c | 40 | ||||
| -rw-r--r-- | src/test/test-cgroup.c | 6 |
2 files changed, 33 insertions, 13 deletions
diff --git a/src/test/test-cgroup-util.c b/src/test/test-cgroup-util.c index 8e24d1ceca..5eaa129418 100644 --- a/src/test/test-cgroup-util.c +++ b/src/test/test-cgroup-util.c @@ -24,20 +24,20 @@ #include "util.h" #include "cgroup-util.h" -static void check_c_t_u(const char *path, int code, const char *result) { +static void check_p_d_u(const char *path, int code, const char *result) { _cleanup_free_ char *unit = NULL; - assert_se(cg_cgroup_to_unit(path, &unit) == code); + assert_se(cg_path_decode_unit(path, &unit) == code); assert_se(streq_ptr(unit, result)); } -static void test_cgroup_to_unit(void) { - check_c_t_u("getty@.service/tty2", 0, "getty@tty2.service"); - check_c_t_u("getty@.service/tty2/xxx", 0, "getty@tty2.service"); - check_c_t_u("getty@.service/", -EINVAL, NULL); - check_c_t_u("getty@.service", -EINVAL, NULL); - check_c_t_u("getty.service", 0, "getty.service"); - check_c_t_u("getty", -EINVAL, NULL); +static void test_path_decode_unit(void) { + check_p_d_u("getty@.service/tty2", 0, "getty@tty2.service"); + check_p_d_u("getty@.service/tty2/xxx", 0, "getty@tty2.service"); + check_p_d_u("getty@.service/", -EINVAL, NULL); + check_p_d_u("getty@.service", -EINVAL, NULL); + check_p_d_u("getty.service", 0, "getty.service"); + check_p_d_u("getty", -EINVAL, NULL); } static void check_p_g_u(const char *path, int code, const char *result) { @@ -62,7 +62,9 @@ static void test_path_get_unit(void) { check_p_g_u("/system/getty@tty6.service/tty5", 0, "getty@tty6.service"); check_p_g_u("sadfdsafsda", -ENOENT, NULL); check_p_g_u("/system/getty####@tty6.service/tty5", -EINVAL, NULL); +} +static void test_path_get_user_unit(void) { check_p_g_u_u("/user/lennart/2/systemd-21548/foobar.service", 0, "foobar.service"); check_p_g_u_u("/user/lennart/2/systemd-21548/foobar.service/waldo", 0, "foobar.service"); check_p_g_u_u("/user/lennart/2/systemd-21548/foobar.service/waldo/uuuux", 0, "foobar.service"); @@ -71,9 +73,27 @@ static void test_path_get_unit(void) { check_p_g_u_u("/user/lennart/2/systemd-21548/foobar@.service/pie/pa/po", 0, "foobar@pie.service"); } +static void test_get_paths(void) { + _cleanup_free_ char *a = NULL, *b = NULL, *c = NULL, *d = NULL; + + assert_se(cg_get_root_path(&a) >= 0); + log_info("Root = %s", a); + + assert_se(cg_get_system_path(&b) >= 0); + log_info("System = %s", b); + + assert_se(cg_get_user_path(&c) >= 0); + log_info("User = %s", c); + + assert_se(cg_get_machine_path(&d) >= 0); + log_info("Machine = %s", d); +} + int main(void) { - test_cgroup_to_unit(); + test_path_decode_unit(); test_path_get_unit(); + test_path_get_user_unit(); + test_get_paths(); return 0; } diff --git a/src/test/test-cgroup.c b/src/test/test-cgroup.c index 2f7cc9be0a..3a3489d6a2 100644 --- a/src/test/test-cgroup.c +++ b/src/test/test-cgroup.c @@ -37,19 +37,19 @@ int main(int argc, char*argv[]) { assert_se(cg_create(SYSTEMD_CGROUP_CONTROLLER, "/test-b/test-c", NULL) == 0); assert_se(cg_create_and_attach(SYSTEMD_CGROUP_CONTROLLER, "/test-b", 0) == 0); - assert_se(cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, getpid(), &path) == 0); + assert_se(cg_pid_get_path(SYSTEMD_CGROUP_CONTROLLER, getpid(), &path) == 0); assert_se(streq(path, "/test-b")); free(path); assert_se(cg_attach(SYSTEMD_CGROUP_CONTROLLER, "/test-a", 0) == 0); - assert_se(cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, getpid(), &path) == 0); + assert_se(cg_pid_get_path(SYSTEMD_CGROUP_CONTROLLER, getpid(), &path) == 0); assert_se(path_equal(path, "/test-a")); free(path); assert_se(cg_create_and_attach(SYSTEMD_CGROUP_CONTROLLER, "/test-b/test-d", 0) == 0); - assert_se(cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, getpid(), &path) == 0); + assert_se(cg_pid_get_path(SYSTEMD_CGROUP_CONTROLLER, getpid(), &path) == 0); assert_se(path_equal(path, "/test-b/test-d")); free(path); |