File 0019-TEST-18-FAILUREACTION-adapt-for-SUSE-openQA.patch of Package systemd-v244-testsuite

From 8682101a81d6c9f696cdc67ad846d27c3637de66 Mon Sep 17 00:00:00 2001
From: Thomas Blume <Thomas.Blume@suse.com>
Date: Thu, 19 Dec 2019 09:01:21 +0100
Subject: [PATCH 19/24] TEST-18-FAILUREACTION: adapt for SUSE openQA

---
 test/TEST-18-FAILUREACTION/test.sh      | 6 +++++-
 test/TEST-18-FAILUREACTION/testsuite.sh | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/TEST-18-FAILUREACTION/test.sh b/test/TEST-18-FAILUREACTION/test.sh
index e9f6ee7afe..ec40b62ef1 100755
--- a/test/TEST-18-FAILUREACTION/test.sh
+++ b/test/TEST-18-FAILUREACTION/test.sh
@@ -2,6 +2,7 @@
 set -e
 TEST_DESCRIPTION="FailureAction= operation"
 
+export TEST_BASE_DIR=/var/opt/systemd-tests/test
 . $TEST_BASE_DIR/test-functions
 QEMU_TIMEOUT=600
 
@@ -13,7 +14,6 @@ test_setup() {
         eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
 
         setup_basic_environment
-        mask_supporting_services
 
         # setup the testsuite service
         cat >$initdir/etc/systemd/system/testsuite.service <<EOF
@@ -22,6 +22,7 @@ Description=Testsuite service
 
 [Service]
 ExecStart=/bin/bash -x /testsuite.sh
+ExecStopPost=/bin/sh -x -c 'systemctl --state=failed --no-pager > /failed'
 Type=oneshot
 EOF
         cp testsuite.sh $initdir/
@@ -30,6 +31,9 @@ EOF
     )
 
     setup_nspawn_root
+
+    mask_supporting_services_nspawn
+
 }
 
 do_test "$@"
diff --git a/test/TEST-18-FAILUREACTION/testsuite.sh b/test/TEST-18-FAILUREACTION/testsuite.sh
index 6ab2638d8c..c946e42b19 100755
--- a/test/TEST-18-FAILUREACTION/testsuite.sh
+++ b/test/TEST-18-FAILUREACTION/testsuite.sh
@@ -9,7 +9,7 @@ if ! test -f /firstphase ; then
     echo OK > /firstphase
     systemd-run --wait -p SuccessAction=reboot true
 else
-    echo OK > /testok
+    echo SUSEtest OK > /testok
     systemd-run --wait -p FailureAction=poweroff false
 fi
 
-- 
2.16.4