File 0001-TEST-17-UDEV-WANTS-adapt-for-openQA.patch of Package systemd-v245-testsuite
From bc59939360303897e49fa1954f5a243efb6574b8 Mon Sep 17 00:00:00 2001
From: Elisei Roca <eroca@suse.de>
Date: Fri, 8 May 2020 19:12:37 +0200
Subject: [PATCH] TEST-17-UDEV-WANTS: adapt for openQA
---
test/TEST-17-UDEV-WANTS/test.sh | 31 ++++++++++++------
test/TEST-17-UDEV-WANTS/testsuite.sh | 47 ++++++++++++++--------------
2 files changed, 44 insertions(+), 34 deletions(-)
diff --git a/test/TEST-17-UDEV-WANTS/test.sh b/test/TEST-17-UDEV-WANTS/test.sh
index e196003e80..77e9d0da4c 100755
--- a/test/TEST-17-UDEV-WANTS/test.sh
+++ b/test/TEST-17-UDEV-WANTS/test.sh
@@ -3,21 +3,16 @@ set -e
TEST_DESCRIPTION="UDEV SYSTEMD_WANTS 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,26 @@ Description=Testsuite service
ExecStart=/bin/bash -x /testsuite.sh
Type=oneshot
EOF
- cp testsuite.sh $initdir/
-
- setup_testsuite
+ cp testsuite.sh /
)
}
+test_run() {
+ systemctl daemon-reload
+ systemctl start testsuite.service || return 1
+ ret=1
+ test -s /failed && ret=$(($ret+1))
+ [[ -e /testok ]] && ret=0
+ return $ret
+}
+
+test_cleanup() {
+ _test_cleanup
+ rm -f /etc/systemd/system/testsuite.service
+ rm -f /testsuite.sh
+ [[ -e /testok ]] && rm /testok
+ [[ -e /failed ]] && rm /failed
+ return 0
+}
+
do_test "$@"
diff --git a/test/TEST-17-UDEV-WANTS/testsuite.sh b/test/TEST-17-UDEV-WANTS/testsuite.sh
index 989c190ce3..ddb8a60dc6 100755
--- a/test/TEST-17-UDEV-WANTS/testsuite.sh
+++ b/test/TEST-17-UDEV-WANTS/testsuite.sh
@@ -6,48 +6,48 @@ mkdir -p /run/udev/rules.d/
rm -f /run/udev/rules.d/50-testsuite.rules
udevadm control --reload
-udevadm trigger /dev/sda
+udevadm trigger /dev/vda
while : ; do
(
- udevadm info /dev/sda | grep -q -v SYSTEMD_WANTS=foobar.service
- udevadm info /dev/sda | grep -q -v SYSTEMD_WANTS=waldo.service
- systemctl show -p WantedBy foobar.service | grep -q -v sda
- systemctl show -p WantedBy waldo.service | grep -q -v sda
+ udevadm info /dev/vda | grep -q -v SYSTEMD_WANTS=foobar.service
+ udevadm info /dev/vda | grep -q -v SYSTEMD_WANTS=waldo.service
+ systemctl show -p WantedBy foobar.service | grep -q -v vda
+ systemctl show -p WantedBy waldo.service | grep -q -v vda
) && break
sleep .5
done
cat > /run/udev/rules.d/50-testsuite.rules <<EOF
-ACTION!="remove", SUBSYSTEM=="block", KERNEL=="sda", ENV{SYSTEMD_WANTS}="foobar.service"
+ACTION!="remove", SUBSYSTEM=="block", KERNEL=="vda", ENV{SYSTEMD_WANTS}="foobar.service"
EOF
udevadm control --reload
-udevadm trigger /dev/sda
+udevadm trigger /dev/vda
while : ; do
(
- udevadm info /dev/sda | grep -q SYSTEMD_WANTS=foobar.service
- udevadm info /dev/sda | grep -q -v SYSTEMD_WANTS=waldo.service
- systemctl show -p WantedBy foobar.service | grep -q sda
- systemctl show -p WantedBy waldo.service | grep -q -v sda
+ udevadm info /dev/vda | grep -q SYSTEMD_WANTS=foobar.service
+ udevadm info /dev/vda | grep -q -v SYSTEMD_WANTS=waldo.service
+ systemctl show -p WantedBy foobar.service | grep -q vda
+ systemctl show -p WantedBy waldo.service | grep -q -v vda
) && break
sleep .5
done
cat > /run/udev/rules.d/50-testsuite.rules <<EOF
-ACTION!="remove", SUBSYSTEM=="block", KERNEL=="sda", ENV{SYSTEMD_WANTS}="waldo.service"
+ACTION!="remove", SUBSYSTEM=="block", KERNEL=="vda", ENV{SYSTEMD_WANTS}="waldo.service"
EOF
udevadm control --reload
-udevadm trigger /dev/sda
+udevadm trigger /dev/vda
while : ; do
(
- udevadm info /dev/sda | grep -q -v SYSTEMD_WANTS=foobar.service
- udevadm info /dev/sda | grep -q SYSTEMD_WANTS=waldo.service
- systemctl show -p WantedBy foobar.service | grep -q -v sda
- systemctl show -p WantedBy waldo.service | grep -q sda
+ udevadm info /dev/vda | grep -q -v SYSTEMD_WANTS=foobar.service
+ udevadm info /dev/vda | grep -q SYSTEMD_WANTS=waldo.service
+ systemctl show -p WantedBy foobar.service | grep -q -v vda
+ systemctl show -p WantedBy waldo.service | grep -q vda
) && break
sleep .5
@@ -56,19 +56,18 @@ done
rm /run/udev/rules.d/50-testsuite.rules
udevadm control --reload
-udevadm trigger /dev/sda
+udevadm trigger /dev/vda
while : ; do
(
- udevadm info /dev/sda | grep -q -v SYSTEMD_WANTS=foobar.service
- udevadm info /dev/sda | grep -q -v SYSTEMD_WANTS=waldo.service
- systemctl show -p WantedBy foobar.service | grep -q -v sda
- systemctl show -p WantedBy waldo.service | grep -q -v sda
+ udevadm info /dev/vda | grep -q -v SYSTEMD_WANTS=foobar.service
+ udevadm info /dev/vda | grep -q -v SYSTEMD_WANTS=waldo.service
+ systemctl show -p WantedBy foobar.service | grep -q -v vda
+ systemctl show -p WantedBy waldo.service | grep -q -v vda
) && break
sleep .5
done
-echo OK > /testok
-
+echo SUSEtest OK > /testok
exit 0
--
2.26.2
