File 0001-TEST-44-LOG-NAMESPACE-adapt-for-openQA.patch of Package systemd-v245-testsuite
From fe1da79c9328aaf1c1e1f831408f36a074718d2c Mon Sep 17 00:00:00 2001
From: Elisei Roca <eroca@suse.de>
Date: Fri, 8 May 2020 17:26:35 +0200
Subject: [PATCH] TEST-44-LOG-NAMESPACE: adapt for openQA
---
test/TEST-44-LOG-NAMESPACE/test.sh | 29 +++++++++++++++++++++++++
test/TEST-44-LOG-NAMESPACE/testsuite.sh | 2 +-
2 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/test/TEST-44-LOG-NAMESPACE/test.sh b/test/TEST-44-LOG-NAMESPACE/test.sh
index c2070f2b61..95f0e66aab 100755
--- a/test/TEST-44-LOG-NAMESPACE/test.sh
+++ b/test/TEST-44-LOG-NAMESPACE/test.sh
@@ -2,6 +2,7 @@
set -e
TEST_DESCRIPTION="test log namespaces"
+export TEST_BASE_DIR=/var/opt/systemd-tests/test
. $TEST_BASE_DIR/test-functions
test_setup() {
@@ -30,10 +31,38 @@ Type=oneshot
LogTarget=foobar
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
+ 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-44-LOG-NAMESPACE/testsuite.sh b/test/TEST-44-LOG-NAMESPACE/testsuite.sh
index 97541634d0..9af24e357e 100755
--- a/test/TEST-44-LOG-NAMESPACE/testsuite.sh
+++ b/test/TEST-44-LOG-NAMESPACE/testsuite.sh
@@ -14,6 +14,6 @@ grep "hello world" /tmp/hello-world
systemd-analyze log-level info
-echo OK > /testok
+echo SUSEtest OK > /testok
exit 0
--
2.26.2