From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Sat, 29 Apr 2023 07:44:03 +0000 (+0200)
Subject: test: make sure the test units have a `test-` prefix
X-Git-Tag: v254-rc1~591
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=992e06df085e3a7a881d25d6f83b9e98efbbb7ca;p=thirdparty%2Fsystemd.git

test: make sure the test units have a `test-` prefix

So when collecting coverage the test-.service dropin works as
expected.

Follow-up to 969f5f3cea.
---

diff --git a/test/units/testsuite-19.sh b/test/units/testsuite-19.sh
index 20759eaa1f9..93280993f11 100755
--- a/test/units/testsuite-19.sh
+++ b/test/units/testsuite-19.sh
@@ -46,7 +46,7 @@ if grep -q cgroup2 /proc/filesystems ; then
     test_scope_unpriv_delegation
 
     # Verify that DelegateSubgroup= affects ownership correctly
-    U="testsubgroup-$RANDOM.service"
+    U="test-subgroup-$RANDOM.service"
     systemd-run --wait --unit="$U" -p "DynamicUser=1" -p "Delegate=pids" -p "DelegateSubgroup=foo" \
                 test -w "/sys/fs/cgroup/system.slice/$U" -a \
                      -w "/sys/fs/cgroup/system.slice/$U/foo"
@@ -54,13 +54,13 @@ if grep -q cgroup2 /proc/filesystems ; then
     # Check that for the subgroup also attributes that aren't covered by
     # regular (i.e. main cgroup) delegation ownership rules are delegated properly
     if test -f /sys/fs/cgroup/cgroup.max.depth ; then
-        U="testsubgroup-$RANDOM.service"
+        U="test-subgroup-$RANDOM.service"
         systemd-run --wait --unit="$U" -p "DynamicUser=1" -p "Delegate=pids" -p "DelegateSubgroup=zzz" \
                     test -w "/sys/fs/cgroup/system.slice/$U/zzz/cgroup.max.depth"
     fi
 
     # Check that the invoked process itsel is also in the subgroup
-    U="testsubgroup-$RANDOM.service"
+    U="test-subgroup-$RANDOM.service"
     systemd-run --wait --unit="$U" -p "DynamicUser=1" -p "Delegate=pids" -p "DelegateSubgroup=bar" \
                 grep -q -x -F "0::/system.slice/$U/bar" /proc/self/cgroup
 else