From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 20 Sep 2018 07:08:38 +0000 (+0900)
Subject: test-process-util: skip several verifications when running in unprivileged container
X-Git-Tag: v240~661^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=767eab47501b06327a0e6030e5c54860a3fc427f;p=thirdparty%2Fsystemd.git

test-process-util: skip several verifications when running in unprivileged container
---

diff --git a/src/test/test-process-util.c b/src/test/test-process-util.c
index d396c29b06b..d0eba322026 100644
--- a/src/test/test-process-util.c
+++ b/src/test/test-process-util.c
@@ -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);
 }