From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 15 Mar 2019 14:27:32 +0000 (+0100)
Subject: test-execute: block /sys not /proc
X-Git-Tag: v242-rc1~120^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=054d871d41039fcfc1a4a661c979941b9660c9e6;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/src/test/test-execute.c b/src/test/test-execute.c
index 4d44a28a313..f59d267776f 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 870f8bc6a74..7255c79dcb8 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
similarity index 63%
rename from test/test-execute/exec-inaccessiblepaths-proc.service
rename to test/test-execute/exec-inaccessiblepaths-sys.service
index ebdb4843d1b..5ff6f3605b1 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