File 0001-TEST-22-TMPFILES-adapt-for-openQA.patch of Package systemd-v245-testsuite

From 0308641e39886ce11f9d455bd836572a353ebbbf Mon Sep 17 00:00:00 2001
From: Elisei Roca <eroca@suse.de>
Date: Fri, 8 May 2020 18:31:36 +0200
Subject: [PATCH] TEST-22-TMPFILES: adapt for openQA

---
 test/TEST-22-TMPFILES/run-tmpfiles-tests.sh |  2 +-
 test/TEST-22-TMPFILES/test.sh               | 34 +++++++++++++++++++++
 test/TEST-22-TMPFILES/testsuite.service     |  4 +--
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/test/TEST-22-TMPFILES/run-tmpfiles-tests.sh b/test/TEST-22-TMPFILES/run-tmpfiles-tests.sh
index a0158f0421..d630658ed3 100755
--- a/test/TEST-22-TMPFILES/run-tmpfiles-tests.sh
+++ b/test/TEST-22-TMPFILES/run-tmpfiles-tests.sh
@@ -9,5 +9,5 @@ for t in test-*.sh; do
         echo "Running $t"; ./$t
 done
 
-touch /testok
+echo SUSEtest OK > /testok
 rm /failed
diff --git a/test/TEST-22-TMPFILES/test.sh b/test/TEST-22-TMPFILES/test.sh
index aa6efcfb48..cef465916a 100755
--- a/test/TEST-22-TMPFILES/test.sh
+++ b/test/TEST-22-TMPFILES/test.sh
@@ -3,9 +3,12 @@ set -e
 TEST_DESCRIPTION="Tmpfiles related tests"
 TEST_NO_QEMU=1
 
+export TEST_BASE_DIR=/var/opt/systemd-tests/test
 . $TEST_BASE_DIR/test-functions
 
 test_setup() {
+    LOG_LEVEL=5
+
     # create the basic filesystem layout
     setup_basic_environment
     mask_supporting_services
@@ -18,14 +21,45 @@ test_setup() {
 
     # setup the testsuite service
     cp testsuite.service $initdir/etc/systemd/system/
+    cp testsuite.service /etc/systemd/system/
     setup_testsuite
 
     mkdir -p $initdir/testsuite
     cp run-tmpfiles-tests.sh $initdir/testsuite/
     cp test-*.sh $initdir/testsuite/
 
+    mkdir -p /testsuite
+    cp run-tmpfiles-tests.sh /testsuite/
+    cp test-*.sh /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 -rf /testsuite
+    rm -f /etc/systemd/system/testsuite.service
+    for file in $(ls /testok* /failed* 2>/dev/null); do
+      rm $file
+    done
+    return 0
+}
+
 do_test "$@"
diff --git a/test/TEST-22-TMPFILES/testsuite.service b/test/TEST-22-TMPFILES/testsuite.service
index 2f1b15c3ed..02e2b3db0a 100644
--- a/test/TEST-22-TMPFILES/testsuite.service
+++ b/test/TEST-22-TMPFILES/testsuite.service
@@ -8,5 +8,5 @@ Wants=getty-pre.target
 WorkingDirectory=/testsuite
 ExecStart=/testsuite/run-tmpfiles-tests.sh
 Type=oneshot
-StandardOutput=tty
-StandardError=tty
+StandardOutput=kmsg
+StandardError=kmsg
-- 
2.26.2