From a9d8bebacde42b86da60e11b440524906175fcf3 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 16 Sep 2021 06:38:08 +0900
Subject: [PATCH] test: use --settle option for udevadm trigger

---
 test/units/testsuite-17.05.sh | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/test/units/testsuite-17.05.sh b/test/units/testsuite-17.05.sh
index 1e7f7f41b0a..4bfc09a7cfa 100755
--- a/test/units/testsuite-17.05.sh
+++ b/test/units/testsuite-17.05.sh
@@ -10,15 +10,13 @@ ACTION=="add", SUBSYSTEM=="mem", KERNEL=="null", IMPORT{program}="/bin/echo -e H
 EOF
 
 udevadm control --reload
-udevadm trigger -c add /dev/null
+udevadm trigger --settle --action add /dev/null
 
-while : ; do
-    test -f /run/udev/data/c1:3 &&
-        udevadm info /dev/null | grep -q 'E: HOGE=aa\\x20\\x20\\x20bb' &&
-        udevadm info /dev/null | grep -q 'E: FOO=\\x20aaa\\x20' &&
-        break
+test -f /run/udev/data/c1:3
+udevadm info /dev/null | grep -q 'E: HOGE=aa\\x20\\x20\\x20bb'
+udevadm info /dev/null | grep -q 'E: FOO=\\x20aaa\\x20'
 
-    sleep .5
-done
+rm /run/udev/rules.d/50-testsuite.rules
+udevadm control --reload
 
 exit 0