diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-03-15 15:27:32 +0100 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-03-15 15:46:41 +0100 |
commit | 054d871d41039fcfc1a4a661c979941b9660c9e6 (patch) | |
tree | 69f0254ed6c110b5bb07d3b887eb98390cdf2e57 | |
parent | 6a461d1f59850ff27bd254a3b71fe9ade0523e76 (diff) | |
download | systemd-054d871d41039fcfc1a4a661c979941b9660c9e6.tar.gz |
test-execute: block /sys not /proc
As explained in the previous commit, blocking /proc can cause us
to go into a long loop or fail the test.
-rw-r--r-- | src/test/test-execute.c | 2 | ||||
-rw-r--r-- | test/meson.build | 2 | ||||
-rw-r--r-- | test/test-execute/exec-inaccessiblepaths-sys.service (renamed from test/test-execute/exec-inaccessiblepaths-proc.service) | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/test/test-execute.c b/src/test/test-execute.c index 4d44a28a31..f59d267776 100644 --- a/src/test/test-execute.c +++ b/src/test/test-execute.c @@ -327,7 +327,7 @@ static void test_exec_inaccessiblepaths(Manager *m) { return; } - test(m, "exec-inaccessiblepaths-proc.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED); + test(m, "exec-inaccessiblepaths-sys.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED); if (path_is_read_only_fs("/") > 0) { log_notice("Root directory is readonly, skipping remaining tests in %s", __func__); diff --git a/test/meson.build b/test/meson.build index 870f8bc6a7..7255c79dcb 100644 --- a/test/meson.build +++ b/test/meson.build @@ -67,7 +67,7 @@ test_data_files = ''' test-execute/exec-ignoresigpipe-no.service test-execute/exec-ignoresigpipe-yes.service test-execute/exec-inaccessiblepaths-mount-propagation.service - test-execute/exec-inaccessiblepaths-proc.service + test-execute/exec-inaccessiblepaths-sys.service test-execute/exec-ioschedulingclass-best-effort.service test-execute/exec-ioschedulingclass-idle.service test-execute/exec-ioschedulingclass-none.service diff --git a/test/test-execute/exec-inaccessiblepaths-proc.service b/test/test-execute/exec-inaccessiblepaths-sys.service index ebdb4843d1..5ff6f3605b 100644 --- a/test/test-execute/exec-inaccessiblepaths-proc.service +++ b/test/test-execute/exec-inaccessiblepaths-sys.service @@ -2,6 +2,6 @@ Description=Test to make sure that mount namespace setup works properly with the 'InaccessiblePaths=/proc' option [Service] -InaccessiblePaths=/proc -ExecStart=/bin/sh -x -c 'test "$$(stat -c %%a /proc)" = "0"' +InaccessiblePaths=/sys +ExecStart=/bin/sh -x -c 'test "$$(stat -c %%a /sys)" = "0"' Type=oneshot |