File 0016-TEST-15-DROPIN-adapt-for-SUSE-openQA.patch of Package systemd-v244-testsuite

From 4d255b2e100b825111abac168b3bf14a70e16b70 Mon Sep 17 00:00:00 2001
From: Thomas Blume <Thomas.Blume@suse.com>
Date: Thu, 19 Dec 2019 08:59:02 +0100
Subject: [PATCH 16/24] TEST-15-DROPIN: adapt for SUSE openQA

---
 test/TEST-15-DROPIN/test-dropin.sh | 2 +-
 test/TEST-15-DROPIN/test.sh        | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/TEST-15-DROPIN/test-dropin.sh b/test/TEST-15-DROPIN/test-dropin.sh
index fe424c1587..b154ceeb8b 100755
--- a/test/TEST-15-DROPIN/test-dropin.sh
+++ b/test/TEST-15-DROPIN/test-dropin.sh
@@ -424,4 +424,4 @@ test_template_dropins
 test_alias_dropins
 test_masked_dropins
 
-touch /testok
+echo SUSEtest OK > /testok
diff --git a/test/TEST-15-DROPIN/test.sh b/test/TEST-15-DROPIN/test.sh
index a1d0c618d9..6433aacd7a 100755
--- a/test/TEST-15-DROPIN/test.sh
+++ b/test/TEST-15-DROPIN/test.sh
@@ -8,15 +8,16 @@ TEST_NO_QEMU=1
 test_setup() {
     # create the basic filesystem layout
     setup_basic_environment
-    mask_supporting_services
 
     # import the test scripts in the rootfs and plug them in systemd
+    echo "testservice=$initdir/etc/systemd/system/testsuite.service"
     cp testsuite.service $initdir/etc/systemd/system/
     cp test-dropin.sh    $initdir/
     setup_testsuite
 
     # create dedicated rootfs for nspawn (located in $TESTDIR/nspawn-root)
     setup_nspawn_root
+    mask_supporting_services_nspawn
 }
 
 do_test "$@"
-- 
2.16.4