test: move TEST-19-DELEGATE setup to static files

diff --git a/test/TEST-19-DELEGATE/test.sh b/test/TEST-19-DELEGATE/test.sh
index 2fbfef30628580eb36236afcf2abaeebdb068527..872df1561535bf34790fb5d1850f37a2e4be00b8 100755 (executable)
--- a/test/TEST-19-DELEGATE/test.sh
+++ b/test/TEST-19-DELEGATE/test.sh
@@ -16,20 +16,7 @@ test_setup() {
 
         setup_basic_environment
         mask_supporting_services
-
-        # setup the testsuite service
-        cat >$initdir/etc/systemd/system/testsuite.service <<EOF
-[Unit]
-Description=Testsuite service
-
-[Service]
-ExecStart=/bin/bash -x /testsuite.sh
-Type=oneshot
-EOF
-        cp testsuite.sh $initdir/
-
-        setup_testsuite
     )
 }
 
-do_test "$@"
+do_test "$@" 19

diff --git a/test/TEST-19-DELEGATE/testsuite.sh b/test/TEST-19-DELEGATE/testsuite.sh
deleted file mode 100755 (executable)
index 57831c2..0000000
--- a/test/TEST-19-DELEGATE/testsuite.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-set -o pipefail
-
-if grep -q cgroup2 /proc/filesystems ; then
-    systemd-run --wait --unit=test0.service -p "DynamicUser=1" -p "Delegate=" \
-                test -w /sys/fs/cgroup/system.slice/test0.service/ -a \
-                -w /sys/fs/cgroup/system.slice/test0.service/cgroup.procs -a \
-                -w /sys/fs/cgroup/system.slice/test0.service/cgroup.subtree_control
-
-    systemd-run --wait --unit=test1.service -p "DynamicUser=1" -p "Delegate=memory pids" \
-                grep -q memory /sys/fs/cgroup/system.slice/test1.service/cgroup.controllers
-
-    systemd-run --wait --unit=test2.service -p "DynamicUser=1" -p "Delegate=memory pids" \
-                grep -q pids /sys/fs/cgroup/system.slice/test2.service/cgroup.controllers
-
-    # "io" is not among the controllers enabled by default for all units, verify that
-    grep -qv io /sys/fs/cgroup/system.slice/cgroup.controllers
-
-    # Run a service with "io" enabled, and verify it works
-    systemd-run --wait --unit=test3.service -p "IOAccounting=yes" -p "Slice=system-foo-bar-baz.slice"  \
-                grep -q io /sys/fs/cgroup/system.slice/system-foo.slice/system-foo-bar.slice/system-foo-bar-baz.slice/test3.service/cgroup.controllers
-
-    # We want to check if "io" is removed again from the controllers
-    # list. However, PID 1 (rightfully) does this asynchronously. In order
-    # to force synchronization on this, let's start a short-lived service
-    # which requires PID 1 to refresh the cgroup tree, so that we can
-    # verify that this all works.
-    systemd-run --wait --unit=test4.service true
-
-    # And now check again, "io" should have vanished
-    grep -qv io /sys/fs/cgroup/system.slice/cgroup.controllers
-else
-    echo "Skipping TEST-19-DELEGATE, as the kernel doesn't actually support cgroup v2" >&2
-fi
-
-echo OK > /testok
-
-exit 0

diff --git a/test/units/testsuite-19.service b/test/units/testsuite-19.service
new file mode 100644 (file)
index 0000000..13a0b61
--- /dev/null
+++ b/test/units/testsuite-19.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=TEST-19-DELEGATE
+
+[Service]
+ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
+Type=oneshot

diff --git a/test/units/testsuite-19.sh b/test/units/testsuite-19.sh
new file mode 100755 (executable)
index 0000000..57831c2
--- /dev/null
+++ b/test/units/testsuite-19.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+set -ex
+set -o pipefail
+
+if grep -q cgroup2 /proc/filesystems ; then
+    systemd-run --wait --unit=test0.service -p "DynamicUser=1" -p "Delegate=" \
+                test -w /sys/fs/cgroup/system.slice/test0.service/ -a \
+                -w /sys/fs/cgroup/system.slice/test0.service/cgroup.procs -a \
+                -w /sys/fs/cgroup/system.slice/test0.service/cgroup.subtree_control
+
+    systemd-run --wait --unit=test1.service -p "DynamicUser=1" -p "Delegate=memory pids" \
+                grep -q memory /sys/fs/cgroup/system.slice/test1.service/cgroup.controllers
+
+    systemd-run --wait --unit=test2.service -p "DynamicUser=1" -p "Delegate=memory pids" \
+                grep -q pids /sys/fs/cgroup/system.slice/test2.service/cgroup.controllers
+
+    # "io" is not among the controllers enabled by default for all units, verify that
+    grep -qv io /sys/fs/cgroup/system.slice/cgroup.controllers
+
+    # Run a service with "io" enabled, and verify it works
+    systemd-run --wait --unit=test3.service -p "IOAccounting=yes" -p "Slice=system-foo-bar-baz.slice"  \
+                grep -q io /sys/fs/cgroup/system.slice/system-foo.slice/system-foo-bar.slice/system-foo-bar-baz.slice/test3.service/cgroup.controllers
+
+    # We want to check if "io" is removed again from the controllers
+    # list. However, PID 1 (rightfully) does this asynchronously. In order
+    # to force synchronization on this, let's start a short-lived service
+    # which requires PID 1 to refresh the cgroup tree, so that we can
+    # verify that this all works.
+    systemd-run --wait --unit=test4.service true
+
+    # And now check again, "io" should have vanished
+    grep -qv io /sys/fs/cgroup/system.slice/cgroup.controllers
+else
+    echo "Skipping TEST-19-DELEGATE, as the kernel doesn't actually support cgroup v2" >&2
+fi
+
+echo OK > /testok
+
+exit 0