File 0020-TEST-11-ISSUE-3166-remove-qemu-from-testrun.patch of Package systemd-v234-testsuite

From a9dc663a823ca604ab404d560461a090d826c449 Mon Sep 17 00:00:00 2001
From: Thomas Blume <thomas.blume@suse.com>
Date: Tue, 19 Mar 2019 10:33:56 +0100
Subject: [PATCH] TEST-11-ISSUE-3166: remove qemu from testrun

---
 test/TEST-11-ISSUE-3166/test.sh | 50 ++++++++++++++++++++++++++++++++---------
 1 file changed, 40 insertions(+), 10 deletions(-)

diff --git a/test/TEST-11-ISSUE-3166/test.sh b/test/TEST-11-ISSUE-3166/test.sh
index 4602bdfc98..88186f1ce3 100755
--- a/test/TEST-11-ISSUE-3166/test.sh
+++ b/test/TEST-11-ISSUE-3166/test.sh
@@ -5,30 +5,47 @@ set -e
 TEST_DESCRIPTION="https://github.com/systemd/systemd/issues/3166"
 TEST_NO_NSPAWN=1
 
+export TEST_BASE_DIR=/var/opt/systemd-tests/test
 . $TEST_BASE_DIR/test-functions
-SKIP_INITRD=yes
+
+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
     mkdir -p $TESTDIR/root
-    mount ${LOOPDEV}p1 $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
-        dracut_install false touch
+	setup_basic_environment
 
         # setup the testsuite service
-        cat >$initdir/etc/systemd/system/testsuite.service <<EOF
+	cat >$initdir/etc/systemd/system/testsuite.service <<EOF
 [Unit]
 Description=Testsuite service
 After=multi-user.target
 
 [Service]
-ExecStart=/test-fail-on-restart.sh
+ExecStart=$initdir/test-fail-on-restart.sh
+ExecStartPost=/bin/sh -x -c 'echo -e "\nfailed:" > /failed; systemctl status fail-on-restart.service >> /failed; echo -e "\ntestresult:\nOK" > /testok'
 Type=oneshot
 EOF
 
@@ -60,8 +77,21 @@ EOF
         setup_testsuite
     ) || return 1
 
-    ddebug "umount $TESTDIR/root"
-    umount $TESTDIR/root
+
+    # copy the units used by this test
+    for service in testsuite.service fail-on-restart.service; do
+        cp $initdir/etc/systemd/system/$service /etc/systemd/system/
+    done
+}
+
+test_cleanup() {
+    for service in testsuite.service fail-on-restart.service; do
+         rm /etc/systemd/system/$service
+    done
+    [[ -e /testok ]] && rm /testok
+    [[ -e /failed ]] && rm /failed
+    return 0
+
 }
 
 do_test "$@"
-- 
2.16.4