diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-09-20 16:08:38 +0900 |
|---|---|---|
| committer | The Plumber <50238977+systemd-rhel-bot@users.noreply.github.com> | 2020-04-21 10:45:41 +0200 |
| commit | b550cc33e762fa209b0740f1874f75ef780b8d90 (patch) | |
| tree | aa1418ece6e5b6899fde3a47d458bbcf5ac8f5e6 | |
| parent | 15ab55eca3d1f7feb86e55bdc147069f36d198eb (diff) | |
| download | systemd-b550cc33e762fa209b0740f1874f75ef780b8d90.tar.gz | |
test-process-util: skip several verifications when running in unprivileged container
(cherry picked from commit 767eab47501b06327a0e6030e5c54860a3fc427f)
Resolves: #1823767
| -rw-r--r-- | src/test/test-process-util.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/test/test-process-util.c b/src/test/test-process-util.c index fd4d17408d..26e3247993 100644 --- a/src/test/test-process-util.c +++ b/src/test/test-process-util.c @@ -394,12 +394,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); } |