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 4d44a28a313c9c37cba32c77e2e66faee7c84f17..f59d267776f408161d44b0d883a736a716587507 100644 (file)
--- 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 870f8bc6a74b53ba0b1ccf8ea5daf5f8cec7d8f9..7255c79dcb8ccc92f1be7ae21a842338ffea2f8a 100644 (file)
--- 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-proc.service
deleted file mode 100644 (file)
index ebdb484..0000000
--- a/test/test-execute/exec-inaccessiblepaths-proc.service
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-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"'
-Type=oneshot

diff --git a/test/test-execute/exec-inaccessiblepaths-sys.service b/test/test-execute/exec-inaccessiblepaths-sys.service
new file mode 100644 (file)
index 0000000..5ff6f36
--- /dev/null
+++ b/test/test-execute/exec-inaccessiblepaths-sys.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Test to make sure that mount namespace setup works properly with the 'InaccessiblePaths=/proc' option
+
+[Service]
+InaccessiblePaths=/sys
+ExecStart=/bin/sh -x -c 'test "$$(stat -c %%a /sys)" = "0"'
+Type=oneshot