File 0017-TEST-16-EXTEND-TIMEOUT-adapt-for-SUSE-openQA.patch of Package systemd-v244-testsuite
From 5209539788b07a6d56ca7748b0e9091790ea8bff Mon Sep 17 00:00:00 2001
From: Thomas Blume <Thomas.Blume@suse.com>
Date: Thu, 19 Dec 2019 08:59:44 +0100
Subject: [PATCH 17/24] TEST-16-EXTEND-TIMEOUT: adapt for SUSE openQA
---
test/TEST-16-EXTEND-TIMEOUT/assess.sh | 2 +-
test/TEST-16-EXTEND-TIMEOUT/test.sh | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/test/TEST-16-EXTEND-TIMEOUT/assess.sh b/test/TEST-16-EXTEND-TIMEOUT/assess.sh
index e7f643f9ad..55c62f4344 100755
--- a/test/TEST-16-EXTEND-TIMEOUT/assess.sh
+++ b/test/TEST-16-EXTEND-TIMEOUT/assess.sh
@@ -50,6 +50,6 @@ then
cp "${TL}" /test.log
exit 1
else
- touch /testok
+ echo SUSEtest OK > /testok
exit 0
fi
diff --git a/test/TEST-16-EXTEND-TIMEOUT/test.sh b/test/TEST-16-EXTEND-TIMEOUT/test.sh
index c5f8af6ec6..7459d10c79 100755
--- a/test/TEST-16-EXTEND-TIMEOUT/test.sh
+++ b/test/TEST-16-EXTEND-TIMEOUT/test.sh
@@ -14,13 +14,14 @@ test_setup() {
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
- mask_supporting_services
for s in success-all success-start success-stop success-runtime \
fail-start fail-stop fail-runtime
do
cp testsuite-${s}.service ${initdir}/etc/systemd/system
done
+
+ echo "testservice=$initdir/etc/systemd/system/testsuite.service"
cp testsuite.service ${initdir}/etc/systemd/system
cp extend_timeout_test_service.sh ${initdir}/
@@ -30,6 +31,8 @@ test_setup() {
)
setup_nspawn_root
+
+ mask_supporting_services_nspawn
}
do_test "$@"
--
2.16.4