File 0001-TEST-47-ISSUE-14566-adapt-for-openQA.patch of Package systemd-v245-testsuite

From 358fd303fe7a7cc3ec0e17c901b993f57ad1a786 Mon Sep 17 00:00:00 2001
From: Elisei Roca <eroca@suse.de>
Date: Fri, 8 May 2020 17:36:57 +0200
Subject: [PATCH] TEST-47-ISSUE-14566: adapt for openQA

---
 test/TEST-47-ISSUE-14566/test.sh      | 33 +++++++++++++++++++++++++++
 test/TEST-47-ISSUE-14566/testsuite.sh |  4 ++--
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/test/TEST-47-ISSUE-14566/test.sh b/test/TEST-47-ISSUE-14566/test.sh
index 35f862331c..fc50d7d62f 100755
--- a/test/TEST-47-ISSUE-14566/test.sh
+++ b/test/TEST-47-ISSUE-14566/test.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 set -e
 TEST_DESCRIPTION="Test that KillMode=mixed does not leave left over proccesses with ExecStopPost="
+
+export TEST_BASE_DIR=/var/opt/systemd-tests/test
 . $TEST_BASE_DIR/test-functions
 
 test_setup() {
@@ -34,10 +36,41 @@ EOF
 
         cp testsuite.sh $initdir/
         cp repro.sh $initdir/
+        cp testsuite.sh /
+        cp repro.sh /
+        cp $initdir/etc/systemd/system/testsuite.service /etc/systemd/system/
+        cp $initdir/etc/systemd/system/issue_14566_test.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/issue_14566_test.service
+    rm -f /etc/systemd/system/testsuite.service
+    rm -f /testsuite.sh /repro.sh /leakedtestpid
+    for file in $(ls /testok* /failed* 2>/dev/null); do
+      rm $file
+    done
+    return 0
+}
+
 do_test "$@"
diff --git a/test/TEST-47-ISSUE-14566/testsuite.sh b/test/TEST-47-ISSUE-14566/testsuite.sh
index a0ba32530e..4be1c37390 100755
--- a/test/TEST-47-ISSUE-14566/testsuite.sh
+++ b/test/TEST-47-ISSUE-14566/testsuite.sh
@@ -3,7 +3,7 @@ set -ex
 set -o pipefail
 
 systemd-analyze log-level debug
-systemd-analyze log-target console
+systemd-analyze log-target kmsg
 
 systemctl start issue_14566_test
 sleep 1
@@ -19,6 +19,6 @@ ps -p "$leaked_pid" && exit 42
 
 systemd-analyze log-level info
 
-echo OK > /testok
+echo SUSEtest OK > /testok
 
 exit 0
-- 
2.26.2