File 0001-TEST-16-EXTEND-TIMEOUT-adapt-for-openQA.patch of Package systemd-v245-testsuite

From fbec4c73ba2d328e10cb65f03e2ab062deb4efdb Mon Sep 17 00:00:00 2001
From: Elisei Roca <eroca@suse.de>
Date: Fri, 8 May 2020 18:59:05 +0200
Subject: [PATCH] TEST-16-EXTEND-TIMEOUT: adapt for openQA

---
 test/TEST-16-EXTEND-TIMEOUT/assess.sh |  2 +-
 test/TEST-16-EXTEND-TIMEOUT/test.sh   | 36 +++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/test/TEST-16-EXTEND-TIMEOUT/assess.sh b/test/TEST-16-EXTEND-TIMEOUT/assess.sh
index 6f98810b30..44812c82c9 100755
--- a/test/TEST-16-EXTEND-TIMEOUT/assess.sh
+++ b/test/TEST-16-EXTEND-TIMEOUT/assess.sh
@@ -50,6 +50,6 @@ then
     cp "${TL}" /test.log
     exit 1
 else
-    touch /testok
+    echo SUSEtest OK > /testok
     exit 0
 fi
diff --git a/test/TEST-16-EXTEND-TIMEOUT/test.sh b/test/TEST-16-EXTEND-TIMEOUT/test.sh
index 43d9f1278b..b15434423f 100755
--- a/test/TEST-16-EXTEND-TIMEOUT/test.sh
+++ b/test/TEST-16-EXTEND-TIMEOUT/test.sh
@@ -4,6 +4,7 @@ TEST_DESCRIPTION="EXTEND_TIMEOUT_USEC=usec start/runtime/stop tests"
 SKIP_INITRD=yes
 TEST_NO_QEMU=1
 
+export TEST_BASE_DIR=/var/opt/systemd-tests/test
 . $TEST_BASE_DIR/test-functions
 
 test_setup() {
@@ -20,11 +21,15 @@ test_setup() {
                  fail-start fail-stop fail-runtime
         do
             cp testsuite-${s}.service ${initdir}/etc/systemd/system
+            cp testsuite-${s}.service /etc/systemd/system
         done
         cp testsuite.service ${initdir}/etc/systemd/system
+        cp testsuite.service /etc/systemd/system
 
         cp extend_timeout_test_service.sh ${initdir}/
+        cp extend_timeout_test_service.sh /
         cp assess.sh ${initdir}/
+        cp assess.sh /
 
         setup_testsuite
     )
@@ -32,4 +37,35 @@ test_setup() {
     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
+    for s in success-all success-start success-stop success-runtime \
+             fail-start fail-stop fail-runtime
+    do
+        rm /etc/systemd/system/testsuite-${s}.service
+    done
+    rm -f /etc/systemd/system/testsuite.service
+    rm -f /extend_timeout_test_service.sh /assess.sh
+    for file in $(ls /testok* /failed* 2>/dev/null); do
+      rm $file
+    done
+    return 0
+}
+
 do_test "$@"
-- 
2.26.2