File 0004-TEST-03-JOBS-adapt-for-SUSE-openQA.patch of Package systemd-v244-testsuite
From a61ca51d348afa1e56ea429ef279543c7c093a06 Mon Sep 17 00:00:00 2001
From: Thomas Blume <Thomas.Blume@suse.com>
Date: Thu, 19 Dec 2019 08:41:58 +0100
Subject: [PATCH 04/24] TEST-03-JOBS: adapt for SUSE openQA
---
test/TEST-03-JOBS/test-jobs.sh | 2 +-
test/TEST-03-JOBS/test.sh | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/test/TEST-03-JOBS/test-jobs.sh b/test/TEST-03-JOBS/test-jobs.sh
index fca6cccb4f..3a78f90047 100755
--- a/test/TEST-03-JOBS/test-jobs.sh
+++ b/test/TEST-03-JOBS/test-jobs.sh
@@ -94,4 +94,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 50b7bce3ed..23ee26edee 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() {
@@ -14,9 +15,10 @@ test_setup() {
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
- mask_supporting_services
+ mask_supporting_services_nspawn
# setup the testsuite service
+ echo "testservice=$initdir/etc/systemd/system/testsuite.service"
cat >$initdir/etc/systemd/system/testsuite.service <<EOF
[Unit]
Description=Testsuite service
--
2.16.4