File 0001-TEST-39-EXECRELOAD-adapt-for-openQA.patch of Package systemd-v245-testsuite

From 9f2e13b1daa8f3d9bf3451e621debfef32f0fa13 Mon Sep 17 00:00:00 2001
From: Elisei Roca <eroca@suse.de>
Date: Fri, 8 May 2020 17:57:03 +0200
Subject: [PATCH] TEST-39-EXECRELOAD: adapt for openQA

---
 test/TEST-39-EXECRELOAD/test.sh      | 29 ++++++++++++++++++++++++++++
 test/TEST-39-EXECRELOAD/testsuite.sh |  4 ++--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/test/TEST-39-EXECRELOAD/test.sh b/test/TEST-39-EXECRELOAD/test.sh
index ac1d0c9cf6..4f91f95408 100755
--- a/test/TEST-39-EXECRELOAD/test.sh
+++ b/test/TEST-39-EXECRELOAD/test.sh
@@ -2,6 +2,7 @@
 set -e
 TEST_DESCRIPTION="Test ExecReload= (PR #13098)"
 
+export TEST_BASE_DIR=/var/opt/systemd-tests/test
 . $TEST_BASE_DIR/test-functions
 
 test_setup() {
@@ -26,10 +27,38 @@ ExecStart=/bin/bash -x /testsuite.sh
 Type=oneshot
 EOF
         cp testsuite.sh $initdir/
+        cp testsuite.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 /etc/systemd/system/execreload*
+    rm -f /testsuite.sh
+    for file in $(ls /testok* /failed* 2>/dev/null); do
+      rm $file
+    done
+    return 0
+}
+
 do_test "$@"
diff --git a/test/TEST-39-EXECRELOAD/testsuite.sh b/test/TEST-39-EXECRELOAD/testsuite.sh
index eb7363fa6a..d98db2c890 100644
--- a/test/TEST-39-EXECRELOAD/testsuite.sh
+++ b/test/TEST-39-EXECRELOAD/testsuite.sh
@@ -4,7 +4,7 @@ set -ex
 set -o pipefail
 
 systemd-analyze log-level debug
-systemd-analyze log-target console
+systemd-analyze log-target kmsg
 
 export SYSTEMD_PAGER=
 SERVICE_PATH="$(mktemp /etc/systemd/system/execreloadXXX.service)"
@@ -59,6 +59,6 @@ systemctl stop $SERVICE_NAME
 
 systemd-analyze log-level info
 
-echo OK > /testok
+echo SUSE testOK > /testok
 
 exit 0
-- 
2.26.2