File 0001-TEST-41-ONESHOT-RESTART-adapt-for-openQA.patch of Package systemd-v245-testsuite

From 1d6ff883d904ddf095acdd57528e0e61117db5c5 Mon Sep 17 00:00:00 2001
From: Elisei Roca <eroca@suse.de>
Date: Fri, 8 May 2020 13:40:51 +0200
Subject: [PATCH] TEST-41-ONESHOT-RESTART: adapt for openQA

---
 test/TEST-41-ONESHOT-RESTART/test.sh      | 31 +++++++++++++++++++++++
 test/TEST-41-ONESHOT-RESTART/testsuite.sh |  4 +--
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/test/TEST-41-ONESHOT-RESTART/test.sh b/test/TEST-41-ONESHOT-RESTART/test.sh
index 54292c0ca2..d371dec7a4 100755
--- a/test/TEST-41-ONESHOT-RESTART/test.sh
+++ b/test/TEST-41-ONESHOT-RESTART/test.sh
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 set -e
 TEST_DESCRIPTION="Test oneshot unit restart on failure"
+
+export TEST_BASE_DIR=/var/opt/systemd-tests/test
 . $TEST_BASE_DIR/test-functions
 
 test_setup() {
@@ -23,10 +25,39 @@ ExecStart=/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 /test-41-oneshot-restart-test
+    rm -f /etc/systemd/system/testsuite.service
+    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-41-ONESHOT-RESTART/testsuite.sh b/test/TEST-41-ONESHOT-RESTART/testsuite.sh
index 905f32e994..f9865043e4 100755
--- a/test/TEST-41-ONESHOT-RESTART/testsuite.sh
+++ b/test/TEST-41-ONESHOT-RESTART/testsuite.sh
@@ -6,7 +6,7 @@ set -o pipefail
 MAX_SECS=60
 
 systemd-analyze log-level debug
-systemd-analyze log-target console
+systemd-analyze log-target kmsg
 
 # test one: Restart=on-failure should restart the service
 ! systemd-run --unit=one -p Type=oneshot -p Restart=on-failure /bin/bash -c "exit 1"
@@ -44,6 +44,6 @@ fi
 
 systemd-analyze log-level info
 
-echo OK > /testok
+echo SUSE testOK > /testok
 
 exit 0
-- 
2.26.2