X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftest%2Ftest-cgroup-util.c;h=68c526ae82385109eced8c71fd3cac55778692ca;hp=12dcc17ddb2a582a1cf18393152eabf0e79b7da3;hb=ed6d629a3487105e31415db9e175dd698ac20125;hpb=751bc6ac79320bc16e63e8c1bbb713c30a3b7bc9

diff --git a/src/test/test-cgroup-util.c b/src/test/test-cgroup-util.c
index 12dcc17dd..68c526ae8 100644
--- a/src/test/test-cgroup-util.c
+++ b/src/test/test-cgroup-util.c
@@ -106,7 +106,8 @@ static void check_p_g_s(const char *path, int code, const char *result) {
 static void test_path_get_session(void) {
         check_p_g_s("/user.slice/user-1000.slice/session-2.scope/foobar.service", 0, "2");
         check_p_g_s("/session-3.scope", 0, "3");
-        check_p_g_s("", -ENOENT, 0);
+        check_p_g_s("/session-.scope", -ENOENT, NULL);
+        check_p_g_s("", -ENOENT, NULL);
 }
 
 static void check_p_g_o_u(const char *path, int code, uid_t result) {
@@ -122,21 +123,6 @@ static void test_path_get_owner_uid(void) {
         check_p_g_o_u("", -ENOENT, 0);
 }
 
-static void check_p_g_m_n(const char *path, int code, const char *result) {
-        _cleanup_free_ char *m = NULL;
-
-        assert_se(cg_path_get_machine_name(path, &m) == code);
-        assert_se(streq_ptr(m, result));
-}
-
-static void test_path_get_machine_name(void) {
-        check_p_g_m_n("/user.slice/machine-foobar.scope", 0, "foobar");
-        check_p_g_m_n("/machine-foobar.scope", 0, "foobar");
-        check_p_g_m_n("/user.slice/user-kuux.slice/machine-foobar.scope", 0, "foobar");
-        check_p_g_m_n("/user.slice/user-kuux.slice/machine-foobar.scope/asjhdkj", 0, "foobar");
-        check_p_g_m_n("", -ENOENT, NULL);
-}
-
 static void test_get_paths(void) {
         _cleanup_free_ char *a = NULL;
 
@@ -177,11 +163,11 @@ static void test_proc(void) {
                 cg_pid_get_machine_name(pid, &machine);
                 cg_pid_get_slice(pid, &slice);
 
-                printf("%lu\t%s\t%s\t%lu\t%s\t%s\t%s\t%s\t%s\n",
-                       (unsigned long) pid,
+                printf(PID_FMT"\t%s\t%s\t"UID_FMT"\t%s\t%s\t%s\t%s\t%s\n",
+                       pid,
                        path,
                        path_shifted,
-                       (unsigned long) uid,
+                       uid,
                        session,
                        unit,
                        user_unit,
@@ -267,7 +253,6 @@ int main(void) {
         test_path_get_user_unit();
         test_path_get_session();
         test_path_get_owner_uid();
-        test_path_get_machine_name();
         TEST_REQ_RUNNING_SYSTEMD(test_get_paths());
         test_proc();
         TEST_REQ_RUNNING_SYSTEMD(test_escape());