File 0001-TEST-15-DROPIN-adapt-for-openQA.patch of Package systemd-v245-testsuite

From adcb0ef9b106766cbaa3336ab7b0d9debb7c11ba Mon Sep 17 00:00:00 2001
From: Elisei Roca <eroca@suse.de>
Date: Fri, 8 May 2020 19:03:49 +0200
Subject: [PATCH] TEST-15-DROPIN: adapt for openQA

---
 test/TEST-15-DROPIN/test-dropin.sh |  2 +-
 test/TEST-15-DROPIN/test.sh        | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/test/TEST-15-DROPIN/test-dropin.sh b/test/TEST-15-DROPIN/test-dropin.sh
index f80c9df107..271a1ec985 100755
--- a/test/TEST-15-DROPIN/test-dropin.sh
+++ b/test/TEST-15-DROPIN/test-dropin.sh
@@ -463,4 +463,4 @@ test_alias_dropins
 test_masked_dropins
 test_invalid_dropins
 
-touch /testok
+echo SUSEtest OK > /testok
diff --git a/test/TEST-15-DROPIN/test.sh b/test/TEST-15-DROPIN/test.sh
index 63bbd35051..f22731c042 100755
--- a/test/TEST-15-DROPIN/test.sh
+++ b/test/TEST-15-DROPIN/test.sh
@@ -3,6 +3,7 @@ set -e
 TEST_DESCRIPTION="Dropin tests"
 TEST_NO_QEMU=1
 
+export TEST_BASE_DIR=/var/opt/systemd-tests/test
 . $TEST_BASE_DIR/test-functions
 
 test_setup() {
@@ -12,11 +13,38 @@ test_setup() {
 
     # import the test scripts in the rootfs and plug them in systemd
     cp testsuite.service $initdir/etc/systemd/system/
+    cp testsuite.service /etc/systemd/system/
     cp test-dropin.sh    $initdir/
+    cp test-dropin.sh /
     setup_testsuite
 
     # create dedicated rootfs for nspawn (located in $TESTDIR/nspawn-root)
     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
+    for file in $(ls /testok* /failed* /test-dropin.sh 2>/dev/null); do
+      rm $file
+    done
+    return 0
+}
+
 do_test "$@"
-- 
2.26.2