File 0012-TEST-11-ISSUE-3166-adapt-for-SUSE-openQA.patch of Package systemd-v244-testsuite

From ba122493418c3fa480ef7e174e620e467898fca9 Mon Sep 17 00:00:00 2001
From: Thomas Blume <Thomas.Blume@suse.com>
Date: Thu, 19 Dec 2019 08:53:27 +0100
Subject: [PATCH 12/24] TEST-11-ISSUE-3166: adapt for SUSE openQA

---
 test/TEST-11-ISSUE-3166/test.sh | 45 +++++++++++++++++++++++++++++++++++++----
 1 file changed, 41 insertions(+), 4 deletions(-)

diff --git a/test/TEST-11-ISSUE-3166/test.sh b/test/TEST-11-ISSUE-3166/test.sh
index 81c12a2783..f559b52678 100755
--- a/test/TEST-11-ISSUE-3166/test.sh
+++ b/test/TEST-11-ISSUE-3166/test.sh
@@ -3,18 +3,36 @@ set -e
 TEST_DESCRIPTION="https://github.com/systemd/systemd/issues/3166"
 TEST_NO_NSPAWN=1
 
+export TEST_BASE_DIR=/var/opt/systemd-tests/test
 . $TEST_BASE_DIR/test-functions
 
+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
 
     # Create what will eventually be our root filesystem onto an overlay
     (
         LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
 
         setup_basic_environment
-        mask_supporting_services
         dracut_install false touch
 
         # setup the testsuite service
@@ -23,7 +41,8 @@ test_setup() {
 Description=Testsuite service
 
 [Service]
-ExecStart=/test-fail-on-restart.sh
+ExecStart=$initdir/test-fail-on-restart.sh
+ExecStartPost=/bin/sh -x -c 'systemctl status fail-on-restart.service > /failed; echo SUSEtest OK > /testok'
 Type=oneshot
 EOF
 
@@ -56,6 +75,24 @@ EOF
         chmod 0755 $initdir/test-fail-on-restart.sh
         setup_testsuite
     )
+
+
+    # copy the units used by this test
+    for service in testsuite.service fail-on-restart.service; do
+        cp $initdir/etc/systemd/system/$service /etc/systemd/system/
+    done
+
+    mask_supporting_services
+}
+
+test_cleanup() {
+    for service in testsuite.service fail-on-restart.service; do
+         rm /etc/systemd/system/$service
+    done
+    [[ -e /testok ]] && rm /testok
+    [[ -e /failed ]] && rm /failed
+    return 0
+
 }
 
 do_test "$@"
-- 
2.16.4