]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test: make sure the test units have a `test-` prefix
authorFrantisek Sumsal <frantisek@sumsal.cz>
Sat, 29 Apr 2023 07:44:03 +0000 (09:44 +0200)
committerFrantisek Sumsal <frantisek@sumsal.cz>
Sat, 29 Apr 2023 14:59:08 +0000 (16:59 +0200)
So when collecting coverage the test-.service dropin works as
expected.

Follow-up to 969f5f3cea.

test/units/testsuite-19.sh

index 20759eaa1f94cdb61dd632fbe3833684f7411ab5..93280993f112f1cad98af501fb5fbe0f388db24b 100755 (executable)
@@ -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