File 0020-TEST-19-DELEGATE-adapt-for-SUSE-openQA.patch of Package systemd-v244-testsuite

From 3c2c2f7bc7c5c4e1b80cb03e497ff2d68c82b05f Mon Sep 17 00:00:00 2001
From: Thomas Blume <Thomas.Blume@suse.com>
Date: Thu, 19 Dec 2019 09:03:19 +0100
Subject: [PATCH] TEST-19-DELEGATE: adapt for SUSE openQA

---
 test/TEST-19-DELEGATE/test.sh      | 53 +++++++++++++++++++++++++++++++++-----
 test/TEST-19-DELEGATE/testsuite.sh |  2 +-
 2 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/test/TEST-19-DELEGATE/test.sh b/test/TEST-19-DELEGATE/test.sh
index 706f0e9fbb..9805c3a865 100755
--- a/test/TEST-19-DELEGATE/test.sh
+++ b/test/TEST-19-DELEGATE/test.sh
@@ -3,19 +3,35 @@ 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_run() {
+    ret=1
+    systemctl daemon-reload
+    systemctl start testsuite.service || return 1
+    systemctl status --full testsuite.service
+    if [ -z "$TEST_NO_NSPAWN" ]; then
+        if run_nspawn; then
+            check_result_nspawn || return 1
+        else
+            dwarn "can't run systemd-nspawn, skipping"
+        fi
+    fi
+    test -s /failed && ret=$(($ret+1))
+    [[ -e /testok ]] && ret=0
+    return $ret
+}
 
 test_setup() {
-    create_empty_image_rootdir
+    mkdir -p $TESTDIR/root
+    initdir=$TESTDIR/root
+    STRIP_BINARIES=no
 
     (
         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
@@ -23,13 +39,36 @@ test_setup() {
 Description=Testsuite service
 
 [Service]
-ExecStart=/bin/bash -x /testsuite.sh
+ExecStart=/bin/bash -x /testsuite.sh &>/testscript.out
+ExecStartPost=/bin/sh -x -c 'systemctl --state=failed --no-pager > /failed'
 Type=oneshot
+StandardOutput=kmsg
+StandardError=kmsg
 EOF
-        cp testsuite.sh $initdir/
+        cp testsuite.sh /
+
+        for service in testsuite.service; do
+            cp $initdir/etc/systemd/system/$service /etc/systemd/system/
+        done
 
         setup_testsuite
     )
+
+   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_cleanup() {
+    for service in testsuite.service; do
+         rm /etc/systemd/system/$service
+    done
+    [[ -e /testok ]] && rm /testok
+    [[ -e /failed ]] && rm /failed
+    [[ -e /testscript.out ]] && rm /testscript.out
+    rm /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 0
 }
 
 do_test "$@"
diff --git a/test/TEST-19-DELEGATE/testsuite.sh b/test/TEST-19-DELEGATE/testsuite.sh
index a2cb2b875f..bf5696d986 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.16.4