From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 15 Sep 2021 21:22:18 +0000 (+0900)
Subject: test: use --settle option for udevadm trigger
X-Git-Tag: v250-rc1~661^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=26146d82db430394c96374d6790a5855b25c5981;p=thirdparty%2Fsystemd.git

test: use --settle option for udevadm trigger
---

diff --git a/test/units/testsuite-17.01.sh b/test/units/testsuite-17.01.sh
index 3b099fc2a48..4f9f72daf10 100755
--- a/test/units/testsuite-17.01.sh
+++ b/test/units/testsuite-17.01.sh
@@ -6,7 +6,7 @@ mkdir -p /run/udev/rules.d/
 
 rm -f /run/udev/rules.d/50-testsuite.rules
 udevadm control --reload
-udevadm trigger /dev/sda
+udevadm trigger --settle /dev/sda
 
 while : ; do
     (
@@ -24,7 +24,7 @@ SUBSYSTEM=="block", KERNEL=="sda", OPTIONS="log_level=debug"
 ACTION!="remove", SUBSYSTEM=="block", KERNEL=="sda", ENV{SYSTEMD_WANTS}="foobar.service"
 EOF
 udevadm control --reload
-udevadm trigger /dev/sda
+udevadm trigger --settle /dev/sda
 
 while : ; do
     (
@@ -42,7 +42,7 @@ SUBSYSTEM=="block", KERNEL=="sda", OPTIONS="log_level=debug"
 ACTION!="remove", SUBSYSTEM=="block", KERNEL=="sda", ENV{SYSTEMD_WANTS}="waldo.service"
 EOF
 udevadm control --reload
-udevadm trigger /dev/sda
+udevadm trigger --settle /dev/sda
 
 while : ; do
     (
@@ -58,7 +58,7 @@ done
 rm /run/udev/rules.d/50-testsuite.rules
 
 udevadm control --reload
-udevadm trigger /dev/sda
+udevadm trigger --settle /dev/sda
 
 while : ; do
     (