File 0001-TEST-32-OOMPOLICY-adapt-for-openQA.patch of Package systemd-v245-testsuite

From 1655549db72d5b6a62bfe913675e866f04986647 Mon Sep 17 00:00:00 2001
From: Elisei Roca <eroca@suse.de>
Date: Fri, 8 May 2020 19:39:18 +0200
Subject: [PATCH] TEST-32-OOMPOLICY: adapt for openQA

---
 test/TEST-32-OOMPOLICY/test.sh      | 30 ++++++++++++++++++++---------
 test/TEST-32-OOMPOLICY/testsuite.sh |  6 ++++--
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/test/TEST-32-OOMPOLICY/test.sh b/test/TEST-32-OOMPOLICY/test.sh
index 36aad419ea..18d171a298 100755
--- a/test/TEST-32-OOMPOLICY/test.sh
+++ b/test/TEST-32-OOMPOLICY/test.sh
@@ -3,22 +3,18 @@ set -e
 TEST_DESCRIPTION="test OOM killer logic"
 TEST_NO_NSPAWN=1
 
+export TEST_BASE_DIR=/var/opt/systemd-tests/test
 . $TEST_BASE_DIR/test-functions
 
 UNIFIED_CGROUP_HIERARCHY=yes
 
 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
 
@@ -27,10 +23,26 @@ ExecStart=/testsuite.sh
 Type=oneshot
 MemoryAccounting=yes
 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
+    [[ -e /testok ]] && rm /testok
+    [[ -e /failed ]] && rm /failed
+    return 0
+}
+
 do_test "$@"
diff --git a/test/TEST-32-OOMPOLICY/testsuite.sh b/test/TEST-32-OOMPOLICY/testsuite.sh
index aafafc1183..1a81d76e85 100755
--- a/test/TEST-32-OOMPOLICY/testsuite.sh
+++ b/test/TEST-32-OOMPOLICY/testsuite.sh
@@ -11,7 +11,7 @@ set -o pipefail
 if test -f /sys/fs/cgroup/system.slice/testsuite.service/memory.oom.group ; then
 
     systemd-analyze log-level debug
-    systemd-analyze log-target console
+    systemd-analyze log-target kmsg
 
     # Run a service that is guaranteed to be the first candidate for OOM killing
     systemd-run --unit=oomtest.service -p Type=exec -p OOMScoreAdjust=1000 -p OOMPolicy=stop -p MemoryAccounting=yes /bin/sleep infinity
@@ -30,8 +30,10 @@ if test -f /sys/fs/cgroup/system.slice/testsuite.service/memory.oom.group ; then
     test "$RESULT" = "oom-kill"
 
     systemd-analyze log-level info
+else
+    echo "Skipping test because 'memory.oom.group' cgroupfs attribute doesn't exist at '/sys/fs/cgroup/system.slice/testsuite.service'"
 fi
 
-echo OK > /testok
+echo SUSEtest OK > /testok
 
 exit 0
-- 
2.26.2