From b6b5135e66c969def195311908fd03c6d64b2f07 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 3 Mar 2023 13:32:37 +0900
Subject: [PATCH 1/3] test: generate debugging logs for udevd after restart

---
 test/units/testsuite-17.10.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/units/testsuite-17.10.sh b/test/units/testsuite-17.10.sh
index e30c98a0b8..02ef718c1b 100755
--- a/test/units/testsuite-17.10.sh
+++ b/test/units/testsuite-17.10.sh
@@ -29,14 +29,15 @@ loopdev="$(losetup --show -f "$blk")"
 
 udevadm -h
 
+udevadm control -e
 udevadm control -l emerg
 udevadm control -l alert
 udevadm control -l crit
 udevadm control -l err
 udevadm control -l warning
 udevadm control -l notice
-udevadm control -l debug
 udevadm control --log-level info
+udevadm control --log-level debug
 (! udevadm control -l hello)
 udevadm control -s
 udevadm control -S
@@ -46,7 +47,6 @@ udevadm control -m 42
 udevadm control --ping
 udevadm control -t 5
 udevadm control -h
-udevadm control -e
 
 udevadm info /dev/null
 udevadm info /sys/class/net/$netdev

From ff0a9199d4e518ae15640893d73053f07b2ce4ec Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 3 Mar 2023 23:13:23 +0900
Subject: [PATCH 2/3] man: fix doubled word

---
 man/udevadm.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/udevadm.xml b/man/udevadm.xml
index 0298123c65..33af155021 100644
--- a/man/udevadm.xml
+++ b/man/udevadm.xml
@@ -490,8 +490,8 @@
           <term><option>--wait-daemon[=<replaceable>SECONDS</replaceable>]</option></term>
           <listitem>
             <para>Before triggering uevents, wait for systemd-udevd daemon to be initialized.
-            Optionally takes timeout value. Default timeout is 5 seconds. This is equivalent to invoke
-            invoking <command>udevadm control --ping</command> before <command>udevadm trigger</command>.</para>
+            Optionally takes timeout value. Default timeout is 5 seconds. This is equivalent to invoking
+            <command>udevadm control --ping</command> before <command>udevadm trigger</command>.</para>
           </listitem>
         </varlistentry>
 

From af766bb844ae9735acf836ac0f45a5f240a65955 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 3 Mar 2023 23:19:27 +0900
Subject: [PATCH 3/3] test: trigger new events after all currently queued
 events are processed

Otherwise, udevd may be busy and udevadm may not receive the reply
for the control packet within the time limit.
---
 test/units/testsuite-17.10.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/units/testsuite-17.10.sh b/test/units/testsuite-17.10.sh
index 02ef718c1b..6978d2a1d6 100755
--- a/test/units/testsuite-17.10.sh
+++ b/test/units/testsuite-17.10.sh
@@ -87,6 +87,7 @@ assert_rc 124 timeout 5 udevadm monitor -t systemd
 assert_rc 124 timeout 5 udevadm monitor --tag-match hello
 udevadm monitor -h
 
+udevadm settle
 udevadm settle -t 5
 udevadm settle -E /sys/class/net/$netdev
 udevadm settle -h
@@ -193,7 +194,9 @@ udevadm trigger --initialized-match
 udevadm trigger --initialized-nomatch
 udevadm trigger -w
 udevadm trigger --uuid /sys/class/net/$netdev
+udevadm settle -t 300
 udevadm trigger --wait-daemon
+udevadm settle -t 300
 udevadm trigger --wait-daemon=5
 udevadm trigger -h