From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 11 Oct 2024 18:09:10 +0000 (+0900)
Subject: TEST-64-UDEV-STORAGE: insert udevadm settle more
X-Git-Tag: v257-rc1~209^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=acadc9a84925fa725de1a4dbcfe2355432c0769a;p=thirdparty%2Fsystemd.git

TEST-64-UDEV-STORAGE: insert udevadm settle more

Hopefully fixes #34073.
---

diff --git a/test/units/TEST-64-UDEV-STORAGE.sh b/test/units/TEST-64-UDEV-STORAGE.sh
index 431b5305e49..39054f83d55 100755
--- a/test/units/TEST-64-UDEV-STORAGE.sh
+++ b/test/units/TEST-64-UDEV-STORAGE.sh
@@ -290,15 +290,21 @@ label: gpt
 name="first_partition", size=5M
 uuid="deadbeef-dead-dead-beef-000000000000", name="failover_part", size=5M
 EOF
+    # Partitioning triggers a synthesized event. Wait for the event being finished.
     udevadm settle
+
     udevadm lock --device /dev/disk/by-id/wwn-0xdeaddeadbeef0000-part2 \
             mkfs.ext4 -U "deadbeef-dead-dead-beef-111111111111" -L "failover_vol" /dev/disk/by-id/wwn-0xdeaddeadbeef0000-part2
+    # Making filesystem triggers a synthesized event. Wait for the event being finished.
+    udevadm settle
 
     modprobe -v dm_multipath
     systemctl start multipathd.service
     systemctl status multipathd.service
-    multipath -ll
+    # multipathd touches many devices on start. multipath command may fail if it is invoked before the
+    # initial setup finished. Let's wait for a while.
     udevadm settle
+    multipath -ll
     ls -l /dev/disk/by-id/
 
     for i in {0..15}; do