File 0001-TEST-03-JOBS-adapt-for-openQA.patch of Package systemd-v245-testsuite
From fa5818adce363e893cd276ef28a00c642547b043 Mon Sep 17 00:00:00 2001
From: Elisei Roca <eroca@suse.de>
Date: Fri, 8 May 2020 19:29:12 +0200
Subject: [PATCH] TEST-03-JOBS: adapt for openQA
---
test/TEST-03-JOBS/test-jobs.sh | 2 +-
test/TEST-03-JOBS/test.sh | 9 +++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/test/TEST-03-JOBS/test-jobs.sh b/test/TEST-03-JOBS/test-jobs.sh
index 85efeeb741..0ec805cbe9 100755
--- a/test/TEST-03-JOBS/test-jobs.sh
+++ b/test/TEST-03-JOBS/test-jobs.sh
@@ -95,4 +95,4 @@ ELAPSED=$(($END_SEC-$START_SEC))
[[ "$ELAPSED" -ge 3 ]] && [[ "$ELAPSED" -le 5 ]] || exit 1
[[ "$RESULT" -ne 0 ]] || exit 1
-touch /testok
+echo "SUSEtest OK" > /testok
diff --git a/test/TEST-03-JOBS/test.sh b/test/TEST-03-JOBS/test.sh
index 5299464b81..80952fd484 100755
--- a/test/TEST-03-JOBS/test.sh
+++ b/test/TEST-03-JOBS/test.sh
@@ -3,6 +3,7 @@ set -e
TEST_DESCRIPTION="Job-related tests"
TEST_NO_QEMU=1
+export TEST_BASE_DIR=/var/opt/systemd-tests/test
. $TEST_BASE_DIR/test-functions
test_setup() {
@@ -37,4 +38,12 @@ EOF
setup_nspawn_root
}
+test_cleanup() {
+ _test_cleanup
+ for file in $(ls /testok* /failed* 2>/dev/null); do
+ rm $file
+ done
+ return 0
+}
+
do_test "$@"
--
2.26.2