File 0015-TEST-14-MACHINE-ID-adapt-for-SUSE-openQA.patch of Package systemd-v244-testsuite

From 450bae9f1e9575acff769da066b4d946fa378e4c Mon Sep 17 00:00:00 2001
From: Thomas Blume <Thomas.Blume@suse.com>
Date: Thu, 19 Dec 2019 08:58:15 +0100
Subject: [PATCH] TEST-14-MACHINE-ID: adapt for SUSE openQA

---
 test/TEST-14-MACHINE-ID/test.sh | 40 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/test/TEST-14-MACHINE-ID/test.sh b/test/TEST-14-MACHINE-ID/test.sh
index 72d7eacbf6..64feee4f9f 100755
--- a/test/TEST-14-MACHINE-ID/test.sh
+++ b/test/TEST-14-MACHINE-ID/test.sh
@@ -5,16 +5,33 @@ TEST_NO_NSPAWN=1
 
 . $TEST_BASE_DIR/test-functions
 
+test_run() {
+    ret=1
+    systemctl daemon-reload
+    systemctl start testsuite.service || return 1
+    systemctl status --full testsuite.service
+    if [ -z "$TEST_NO_NSPAWN" ]; then
+        if run_nspawn; then
+            check_result_nspawn || return 1
+        else
+            dwarn "can't run systemd-nspawn, skipping"
+        fi
+    fi
+    test -s /failed && ret=$(($ret+1))
+    [[ -e /testok ]] && ret=0
+    return $ret
+}
+
 test_setup() {
-    create_empty_image_rootdir
+    mkdir -p $TESTDIR/root
+    initdir=$TESTDIR/root
+    STRIP_BINARIES=no
 
     # Create what will eventually be our root filesystem onto an overlay
     (
         LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
 
         setup_basic_environment
-        mask_supporting_services
         printf "556f48e837bc4424a710fa2e2c9d3e3c\ne3d\n" >$initdir/etc/machine-id
         dracut_install mount cmp
 
@@ -24,7 +41,8 @@ test_setup() {
 Description=Testsuite service
 
 [Service]
-ExecStart=/bin/sh -e -x -c '/test-machine-id-setup.sh; systemctl --state=failed --no-legend --no-pager > /failed ; echo OK > /testok'
+ExecStart=/bin/sh -e -x -c '$initdir/test-machine-id-setup.sh'
+ExecStartPost=/bin/sh -x -c 'systemctl --state=failed --no-pager > /failed; echo SUSEtest OK > /testok'
 Type=oneshot
 EOF
 
@@ -71,8 +89,22 @@ check "$r/etc/machine-id" "$r/run/machine-id"
 EOF
 chmod +x $initdir/test-machine-id-setup.sh
 
+        for service in testsuite.service; do
+            cp $initdir/etc/systemd/system/$service /etc/systemd/system/
+        done
+
         setup_testsuite
     )
+    mask_supporting_services
+}
+
+test_cleanup() {
+    for service in testsuite.service; do
+         rm /etc/systemd/system/$service
+    done
+    [[ -e /testok ]] && rm /testok
+    [[ -e /failed ]] && rm /failed
+    return 0
 }
 
 do_test "$@"
-- 
2.16.4