File 0018-TEST-17-UDEV-WANTS-adapt-for-SUSE-openQA.patch of Package systemd-v244-testsuite
From eeebc593d65357f884d1b6bc3328d19ac79a45ab Mon Sep 17 00:00:00 2001
From: Thomas Blume <Thomas.Blume@suse.com>
Date: Thu, 19 Dec 2019 09:00:32 +0100
Subject: [PATCH 18/24] TEST-17-UDEV-WANTS: adapt for SUSE openQA
---
test/TEST-17-UDEV-WANTS/test.sh | 47 ++++++++++++++++++++++++++++++++----
test/TEST-17-UDEV-WANTS/testsuite.sh | 46 +++++++++++++++++------------------
2 files changed, 65 insertions(+), 28 deletions(-)
diff --git a/test/TEST-17-UDEV-WANTS/test.sh b/test/TEST-17-UDEV-WANTS/test.sh
index 1cdbbd2d8a..2d47923a4d 100755
--- a/test/TEST-17-UDEV-WANTS/test.sh
+++ b/test/TEST-17-UDEV-WANTS/test.sh
@@ -3,18 +3,35 @@ 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_run() {
+ ret=1
+ systemctl daemon-reload
+ systemctl start testsuite.service || return 1
+ systemctl status --full testsuite.service
+ if [ -z "$TEST_NO_NSPAWN" ]; then
+ if run_nspawn; then
+ check_result_nspawn || return 1
+ else
+ dwarn "can't run systemd-nspawn, skipping"
+ fi
+ fi
+ test -s /failed && ret=$(($ret+1))
+ [[ -e /testok ]] && ret=0
+ return $ret
+}
test_setup() {
- create_empty_image_rootdir
+ mkdir -p $TESTDIR/root
+ initdir=$TESTDIR/root
+ STRIP_BINARIES=no
(
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
@@ -23,12 +40,32 @@ Description=Testsuite service
[Service]
ExecStart=/bin/bash -x /testsuite.sh
+ExecStartPost=/bin/sh -x -c 'systemctl --state=failed --no-pager > /failed'
Type=oneshot
+StandardOutput=kmsg
+StandardError=kmsg
EOF
- cp testsuite.sh $initdir/
+ cp testsuite.sh /
+
+ for service in testsuite.service; do
+ cp $initdir/etc/systemd/system/$service /etc/systemd/system/
+ done
setup_testsuite
)
+
+ mask_supporting_services
+
+}
+
+test_cleanup() {
+ for service in testsuite.service; do
+ rm /etc/systemd/system/$service
+ done
+ [[ -e /testok ]] && rm /testok
+ [[ -e /failed ]] && rm /failed
+ rm /testsuite.sh
+ return 0
}
do_test "$@"
diff --git a/test/TEST-17-UDEV-WANTS/testsuite.sh b/test/TEST-17-UDEV-WANTS/testsuite.sh
index ceac3697b5..cc8319d841 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,19 @@ 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.16.4
