File 0001-TEST-18-FAILUREACTION-adapt-for-openQA.patch of Package systemd-v245-testsuite

From 9257cb52084c9dd3e7dc865323adf1d9ec2ea137 Mon Sep 17 00:00:00 2001
From: Elisei Roca <eroca@suse.de>
Date: Fri, 8 May 2020 18:44:53 +0200
Subject: [PATCH] TEST-18-FAILUREACTION: adapt for openQA

---
 test/TEST-18-FAILUREACTION/test.sh      | 21 +++++++++++++++++++--
 test/TEST-18-FAILUREACTION/testsuite.sh |  2 +-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/test/TEST-18-FAILUREACTION/test.sh b/test/TEST-18-FAILUREACTION/test.sh
index b6231e6f5a..ba5acf9bc6 100755
--- a/test/TEST-18-FAILUREACTION/test.sh
+++ b/test/TEST-18-FAILUREACTION/test.sh
@@ -2,8 +2,8 @@
 set -e
 TEST_DESCRIPTION="FailureAction= operation"
 
+export TEST_BASE_DIR=/var/opt/systemd-tests/test
 . $TEST_BASE_DIR/test-functions
-QEMU_TIMEOUT=600
 
 test_setup() {
     create_empty_image_rootdir
@@ -13,7 +13,6 @@ test_setup() {
         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
@@ -32,4 +31,22 @@ EOF
     setup_nspawn_root
 }
 
+test_run() {
+    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
+}
+
+test_cleanup() {
+    _test_cleanup
+    for file in $(ls /testok* /failed* 2>/dev/null); do
+      rm $file
+    done
+    return 0
+}
+
 do_test "$@"
diff --git a/test/TEST-18-FAILUREACTION/testsuite.sh b/test/TEST-18-FAILUREACTION/testsuite.sh
index e471cda51b..078fd814ae 100755
--- a/test/TEST-18-FAILUREACTION/testsuite.sh
+++ b/test/TEST-18-FAILUREACTION/testsuite.sh
@@ -9,7 +9,7 @@ if ! test -f /firstphase ; then
     echo OK > /firstphase
     systemd-run --wait -p SuccessAction=reboot true
 else
-    echo OK > /testok
+    echo SUSEtest OK > /testok
     systemd-run --wait -p FailureAction=poweroff false
 fi
 
-- 
2.26.2