From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 29 Sep 2022 17:38:22 +0000 (+0900)
Subject: test-64-udev-storage: use wait command instead of hackish "udevadm lock true"
X-Git-Tag: v252-rc1~64^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ad8c442a0b5f2352d85959f757df718b4fc056e9;p=thirdparty%2Fsystemd.git

test-64-udev-storage: use wait command instead of hackish "udevadm lock true"

Otherwise, "udevadm lock true" may lock a block device earlier than
"udevadm lock sfdisk &".
---

diff --git a/test/units/testsuite-64.sh b/test/units/testsuite-64.sh
index 0d4c4ff776b..df92a0bb43a 100755
--- a/test/units/testsuite-64.sh
+++ b/test/units/testsuite-64.sh
@@ -289,8 +289,9 @@ EOF
 }
 
 testcase_simultaneous_events() {
-    local disk expected i iterations link num_part part partscript rule target timeout
+    local disk expected i iterations key link num_part part partscript rule target timeout
     local -a devices symlinks
+    local -A running
 
     if [[ -n "${ASAN_OPTIONS:-}" ]] || [[ "$(systemd-detect-virt -v)" == "qemu" ]]; then
         num_part=2
@@ -346,11 +347,12 @@ EOF
             else
                 udevadm lock --device="${devices[$disk]}" sfdisk -q -X gpt "${devices[$disk]}" <"$partscript" &
             fi
+            running[$disk]=$!
         done
 
-        # Wait for the above sfdisk commands to be finished.
-        for disk in {0..9}; do
-            udevadm lock --device="${devices[$disk]}" true
+        for key in "${!running[@]}"; do
+            wait "${running[$key]}"
+            unset "running[$key]"
         done
 
         if ((i % 10 <= 1)); then