File 0001-TEST-30-ONCLOCKCHANGE-adapt-for-openQA.patch of Package systemd-v245-testsuite

From f4fd6467cf927c1a5d585357eb525574d1fe8759 Mon Sep 17 00:00:00 2001
From: Elisei Roca <eroca@suse.de>
Date: Fri, 8 May 2020 18:13:06 +0200
Subject: [PATCH] TEST-30-ONCLOCKCHANGE: adapt for openQA

---
 test/TEST-30-ONCLOCKCHANGE/test.sh      | 39 ++++++++++++++++---------
 test/TEST-30-ONCLOCKCHANGE/testsuite.sh |  8 +++--
 2 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/test/TEST-30-ONCLOCKCHANGE/test.sh b/test/TEST-30-ONCLOCKCHANGE/test.sh
index 9e2c11238c..6374cfb3db 100755
--- a/test/TEST-30-ONCLOCKCHANGE/test.sh
+++ b/test/TEST-30-ONCLOCKCHANGE/test.sh
@@ -3,30 +3,23 @@ set -e
 TEST_DESCRIPTION="test OnClockChange= + OnTimezoneChange="
 TEST_NO_NSPAWN=1
 
+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)
-
-        inst_any /usr/share/zoneinfo/Europe/Kiev
-        inst_any /usr/share/zoneinfo/Europe/Berlin
-
-        setup_basic_environment
         mask_supporting_services
 
         # extend the watchdog
-        mkdir -p $initdir/etc/systemd/system/systemd-timedated.service.d
-        cat >$initdir/etc/systemd/system/systemd-timedated.service.d/watchdog.conf <<EOF
+        mkdir -p /etc/systemd/system/systemd-timedated.service.d
+        cat >/etc/systemd/system/systemd-timedated.service.d/watchdog.conf <<EOF
 [Service]
 WatchdogSec=10min
 EOF
 
         # setup the testsuite service
-        cat >$initdir/etc/systemd/system/testsuite.service <<EOF
+        cat >/etc/systemd/system/testsuite.service <<EOF
 [Unit]
 Description=Testsuite service
 
@@ -34,10 +27,28 @@ Description=Testsuite service
 ExecStart=/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
+    rm -rf /etc/systemd/system/systemd-timedated.service.d
+    for file in $(ls /testok* /failed* 2>/dev/null); do
+      rm $file
+    done
+    return 0
+}
+
 do_test "$@"
diff --git a/test/TEST-30-ONCLOCKCHANGE/testsuite.sh b/test/TEST-30-ONCLOCKCHANGE/testsuite.sh
index a507ffcd7b..ed0cb23aff 100755
--- a/test/TEST-30-ONCLOCKCHANGE/testsuite.sh
+++ b/test/TEST-30-ONCLOCKCHANGE/testsuite.sh
@@ -3,7 +3,9 @@ set -ex
 set -o pipefail
 
 systemd-analyze log-level debug
-systemd-analyze log-target console
+systemd-analyze log-target kmsg
+
+timedatectl set-ntp false
 
 systemctl disable --now systemd-timesyncd.service
 
@@ -26,6 +28,8 @@ while ! test -f /tmp/clock-changed ; do sleep .5 ; done
 
 systemd-analyze log-level info
 
-echo OK > /testok
+timedatectl set-ntp true
+
+echo SUSEtest OK > /testok
 
 exit 0
-- 
2.26.2