]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test-process-util: skip several verifications when running in unprivileged container
authorYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 20 Sep 2018 07:08:38 +0000 (16:08 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 20 Sep 2018 15:44:29 +0000 (00:44 +0900)
src/test/test-process-util.c

index d396c29b06b46aee556f1b3546a67afed5555372..d0eba3220261b960d1cb83dbd4b39ff69631fc8e 100644 (file)
@@ -401,12 +401,17 @@ static void test_rename_process_now(const char *p, int ret) {
         log_info("comm = <%s>", comm);
         assert_se(strneq(comm, p, TASK_COMM_LEN-1));
 
-        assert_se(get_process_cmdline(0, 0, false, &cmdline) >= 0);
+        r = get_process_cmdline(0, 0, false, &cmdline);
+        assert_se(r >= 0);
         /* we cannot expect cmdline to be renamed properly without privileges */
         if (geteuid() == 0) {
-                log_info("cmdline = <%s>", cmdline);
-                assert_se(strneq(p, cmdline, STRLEN("test-process-util")));
-                assert_se(startswith(p, cmdline));
+                if (r == 0 && detect_container() > 0)
+                        log_info("cmdline = <%s> (not verified, Running in unprivileged container?)", cmdline);
+                else {
+                        log_info("cmdline = <%s>", cmdline);
+                        assert_se(strneq(p, cmdline, STRLEN("test-process-util")));
+                        assert_se(startswith(p, cmdline));
+                }
         } else
                 log_info("cmdline = <%s> (not verified)", cmdline);
 }