test: use --settle option for udevadm trigger

diff --git a/test/units/testsuite-17.05.sh b/test/units/testsuite-17.05.sh
index 1e7f7f41b0a5d0de7f4fa95d540e802a7bc0ab1f..4bfc09a7cfa65ea36921e80d12abeb82ea464bb1 100755 (executable)
--- 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