File 0001-TEST-12-ISSUE-3171-adapt-for-openQA.patch of Package systemd-v245-testsuite

From 1cf71862772b19ca4db9ff4e6a7d2bf5d188c23c Mon Sep 17 00:00:00 2001
From: Elisei Roca <eroca@suse.de>
Date: Mon, 17 Aug 2020 16:32:21 +0200
Subject: [PATCH] TEST-12-ISSUE-3171: adapt for openQA

---
 test/TEST-12-ISSUE-3171/test.sh | 37 ++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/test/TEST-12-ISSUE-3171/test.sh b/test/TEST-12-ISSUE-3171/test.sh
index e30c36ed86..fe96bbbfa3 100755
--- a/test/TEST-12-ISSUE-3171/test.sh
+++ b/test/TEST-12-ISSUE-3171/test.sh
@@ -3,6 +3,7 @@ set -e
 TEST_DESCRIPTION="https://github.com/systemd/systemd/issues/3171"
 TEST_NO_QEMU=1
 
+export TEST_BASE_DIR=/var/opt/systemd-tests/test
 . $TEST_BASE_DIR/test-functions
 
 test_setup() {
@@ -15,6 +16,7 @@ test_setup() {
 
         setup_basic_environment
         mask_supporting_services
+        mask_supporting_services_nspawn
         dracut_install cat mv stat nc
 
         # setup the testsuite service
@@ -76,14 +78,47 @@ echo D | nc -w1 -U /run/test.socket
 [[ "$(stat --format='%G' /run/test.socket)" == adm ]]
 
 
-touch /testok
+echo SUSEtest OK > /testok
 EOF
 
         chmod 0755 $initdir/test-socket-group.sh
+
+        # copy the units used by this test
+        cp $initdir/test-socket-group.sh /
+        cp $initdir/etc/systemd/system/testsuite.service /etc/systemd/system/
+
         setup_testsuite
     )
 
     setup_nspawn_root
 }
 
+test_run() {
+    systemctl daemon-reload
+    systemctl start testsuite.service || return 1
+    if [ -z "$TEST_NO_NSPAWN" ]; then
+        if run_nspawn "nspawn-root"; then
+            check_result_nspawn "nspawn-root" || return 1
+        else
+            dwarn "can't run systemd-nspawn, skipping"
+        fi
+    fi
+    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 /run/systemd/system/test.socket
+    rm -f /run/systemd/system/test@.service
+    rm -f /run/test.socket
+    for file in $(ls /testok* /failed* /test-socket-group.sh 2>/dev/null); do
+        rm -f $file
+    done
+    return 0
+}
+
 do_test "$@"
-- 
2.28.0