File 0001-TEST-29-UDEV-ID_RENAMING-adapt-for-openQA.patch of Package systemd-v245-testsuite

From 73b3cb654f87b39b3a5afaa3fda1ea879e67caf1 Mon Sep 17 00:00:00 2001
From: Elisei Roca <eroca@suse.de>
Date: Fri, 8 May 2020 18:14:06 +0200
Subject: [PATCH] TEST-29-UDEV-ID_RENAMING: adapt for openQA

---
 test/TEST-29-UDEV-ID_RENAMING/test.sh      | 32 +++++++++++++++-------
 test/TEST-29-UDEV-ID_RENAMING/testsuite.sh |  2 +-
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/test/TEST-29-UDEV-ID_RENAMING/test.sh b/test/TEST-29-UDEV-ID_RENAMING/test.sh
index fb570b0347..8c2d4e4891 100755
--- a/test/TEST-29-UDEV-ID_RENAMING/test.sh
+++ b/test/TEST-29-UDEV-ID_RENAMING/test.sh
@@ -3,21 +3,16 @@ set -e
 TEST_DESCRIPTION="UDEV ID_RENAMING property"
 TEST_NO_NSPAWN=1
 
+export TEST_BASE_DIR=/var/opt/systemd-tests/test
 . $TEST_BASE_DIR/test-functions
-QEMU_TIMEOUT=300
 
 test_setup() {
-    create_empty_image_rootdir
-
     (
         LOG_LEVEL=5
-        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
+        cat >/etc/systemd/system/testsuite.service <<EOF
 [Unit]
 Description=Testsuite service
 
@@ -25,10 +20,27 @@ Description=Testsuite service
 ExecStart=/bin/bash -x /testsuite.sh
 Type=oneshot
 EOF
-        cp testsuite.sh $initdir/
-
-        setup_testsuite
+        cp testsuite.sh /
     )
 }
 
+test_run() {
+    ret=1
+    systemctl daemon-reload
+    systemctl start testsuite.service || return 1
+    test -s /failed && ret=$(($ret+1))
+    [[ -e /testok ]] && ret=0
+    return $ret
+}
+
+test_cleanup() {
+    _test_cleanup
+    rm -f /testsuite.sh
+    rm -f /etc/systemd/system/testsuite.service
+    for file in $(ls /testok* /failed* 2>/dev/null); do
+      rm $file
+    done
+    return 0
+}
+
 do_test "$@"
diff --git a/test/TEST-29-UDEV-ID_RENAMING/testsuite.sh b/test/TEST-29-UDEV-ID_RENAMING/testsuite.sh
index 5abdb53eb3..b2d3dc38c8 100755
--- a/test/TEST-29-UDEV-ID_RENAMING/testsuite.sh
+++ b/test/TEST-29-UDEV-ID_RENAMING/testsuite.sh
@@ -38,6 +38,6 @@ STATE=$(systemctl show --property=ActiveState --value sys-devices-virtual-net-lo
 rm -f /run/udev/rules.d/50-testsuite.rules
 udevadm control --reload --timeout=600
 
-echo OK > /testok
+echo SUSEtest OK > /testok
 
 exit 0
-- 
2.26.2