File 0001-TEST-19-DELEGATE-adapt-for-openQA.patch of Package systemd-v245-testsuite

From eba045de47e592a87e122605ee1cc12fa3e5e892 Mon Sep 17 00:00:00 2001
From: Elisei Roca <eroca@suse.de>
Date: Fri, 8 May 2020 18:36:12 +0200
Subject: [PATCH] TEST-19-DELEGATE: adapt for openQA

---
 test/TEST-19-DELEGATE/test.sh      | 37 +++++++++++++++++++++---------
 test/TEST-19-DELEGATE/testsuite.sh |  2 +-
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/test/TEST-19-DELEGATE/test.sh b/test/TEST-19-DELEGATE/test.sh
index 2fbfef3062..4b18e91aa5 100755
--- a/test/TEST-19-DELEGATE/test.sh
+++ b/test/TEST-19-DELEGATE/test.sh
@@ -3,22 +3,16 @@ set -e
 TEST_DESCRIPTION="test cgroup delegation in the unified hierarchy"
 TEST_NO_NSPAWN=1
 
+export TEST_BASE_DIR=/var/opt/systemd-tests/test
 . $TEST_BASE_DIR/test-functions
-QEMU_TIMEOUT=600
-UNIFIED_CGROUP_HIERARCHY=yes
 
 test_setup() {
-    create_empty_image_rootdir
-
     (
         LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
         mask_supporting_services
 
         # setup the testsuite service
-        cat >$initdir/etc/systemd/system/testsuite.service <<EOF
+        cat >/etc/systemd/system/testsuite.service <<EOF
 [Unit]
 Description=Testsuite service
 
@@ -26,10 +20,31 @@ Description=Testsuite service
 ExecStart=/bin/bash -x /testsuite.sh
 Type=oneshot
 EOF
-        cp testsuite.sh $initdir/
-
-        setup_testsuite
+        cp testsuite.sh /
     )
+
+    sed -i '/^[ !·······]*GRUB_CMDLINE_LINUX_DEFAULT.*/s/"$/ systemd.unified_cgroup_hierarchy=yes"/' /etc/default/grub
+    grub2-mkconfig -o /boot/grub2/grub.cfg || return 1
+}
+
+test_run() {
+    systemctl daemon-reload
+    systemctl start testsuite.service || return 1
+    ret=1
+    test -s /failed && ret=$(($ret+1))
+    [[ -e /testok ]] && ret=0
+    return $ret
+}
+
+test_cleanup() {
+    _test_cleanup
+    rm -f /etc/systemd/system/testsuite.service
+    rm -f /testsuite.sh
+    sed -i '/^[ !·······]*GRUB_CMDLINE_LINUX_DEFAULT.*/s/ systemd.unified_cgroup_hierarchy=yes//' /etc/default/grub
+    grub2-mkconfig -o /boot/grub2/grub.cfg
+    [[ -e /testok ]] && rm /testok
+    [[ -e /failed ]] && rm /failed
+    return 0
 }
 
 do_test "$@"
diff --git a/test/TEST-19-DELEGATE/testsuite.sh b/test/TEST-19-DELEGATE/testsuite.sh
index 57831c267f..fd6ffbfe03 100755
--- a/test/TEST-19-DELEGATE/testsuite.sh
+++ b/test/TEST-19-DELEGATE/testsuite.sh
@@ -34,6 +34,6 @@ else
     echo "Skipping TEST-19-DELEGATE, as the kernel doesn't actually support cgroup v2" >&2
 fi
 
-echo OK > /testok
+echo SUSEtest OK > /testok
 
 exit 0
-- 
2.26.2