File 0001-TEST-36-NUMAPOLICY-adapt-for-openQA.patch of Package systemd-v245-testsuite

From 48ad505e52130570bf52949f4cbf1346659c2222 Mon Sep 17 00:00:00 2001
From: Elisei Roca <eroca@suse.de>
Date: Mon, 6 Jul 2020 12:16:18 +0200
Subject: [PATCH] TEST-36-NUMAPOLICY: adapt for openQA

---
 test/TEST-36-NUMAPOLICY/test.sh      | 34 ++++++++++++++++++++--------
 test/TEST-36-NUMAPOLICY/testsuite.sh |  2 +-
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/test/TEST-36-NUMAPOLICY/test.sh b/test/TEST-36-NUMAPOLICY/test.sh
index 29addc958b..a261cf0cb5 100755
--- a/test/TEST-36-NUMAPOLICY/test.sh
+++ b/test/TEST-36-NUMAPOLICY/test.sh
@@ -3,23 +3,18 @@ set -e
 
 TEST_DESCRIPTION="test MUMAPolicy= and NUMAMask= options"
 TEST_NO_NSPAWN=1
-QEMU_OPTIONS="-numa node,nodeid=0"
 
+export TEST_BASE_DIR=/var/opt/systemd-tests/test
 . $TEST_BASE_DIR/test-functions
 
 test_setup() {
-    create_empty_image_rootdir
-
     (
         LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
 
-        setup_basic_environment
         mask_supporting_services
-        dracut_install mktemp
 
         # setup the testsuite service
-        cat >$initdir/etc/systemd/system/testsuite.service <<EOF
+        cat >/etc/systemd/system/testsuite.service <<EOF
 [Unit]
 Description=Testsuite service
 
@@ -27,11 +22,30 @@ Description=Testsuite service
 ExecStart=/bin/bash -x /testsuite.sh
 Type=oneshot
 EOF
-        cp testsuite.sh $initdir/
+        cp testsuite.sh /
 
-        setup_testsuite
     )
-    setup_nspawn_root
+}
+
+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
+    rm -f /journal.log /strace.log /jounalCursorFile
+    rm -f /etc/systemd/system/numa-test.service
+    rm -rf /etc/systemd/system/numa-test.service.d
+    [[ -e /testok ]] && rm /testok
+    [[ -e /failed ]] && rm /failed
+    return 0
 }
 
 do_test "$@"
diff --git a/test/TEST-36-NUMAPOLICY/testsuite.sh b/test/TEST-36-NUMAPOLICY/testsuite.sh
index 4a2bede431..670be59a54 100755
--- a/test/TEST-36-NUMAPOLICY/testsuite.sh
+++ b/test/TEST-36-NUMAPOLICY/testsuite.sh
@@ -318,6 +318,6 @@ systemctl daemon-reload
 
 systemd-analyze log-level info
 
-echo OK > /testok
+echo SUSEtest OK > /testok
 
 exit 0
-- 
2.27.0