From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 19 Aug 2022 22:09:21 +0000 (+0900)
Subject: test: wait for whole block device instead of partition
X-Git-Tag: v252-rc1~397
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1af39ef2f6ea7f92ea2cc35b3a5d0e720db6ea4a;p=thirdparty%2Fsystemd.git

test: wait for whole block device instead of partition

In 'udevadm lock' the device /dev/loopX is locked instead of
/dev/loopXp1. Hence, 'udevadm wait' should wait for /dev/loopX.

For some reasons, the kernel sometimes does not emit uevent for
partitions, and 'udevadm wait' for partitions may fail.

Fixes #24360.
---

diff --git a/test/units/testsuite-60.sh b/test/units/testsuite-60.sh
index c221b19c36e..13fe139a38f 100755
--- a/test/units/testsuite-60.sh
+++ b/test/units/testsuite-60.sh
@@ -40,8 +40,8 @@ label:gpt
 name="loop${1?}-part1"
 EOF
     LOOP=$(losetup -P --show -f "/tmp/testsuite-60-dependencies-${1?}.img")
-    udevadm wait --settle --timeout=10 "${LOOP}p1"
-    udevadm lock --device="${LOOP}p1" mkfs.ext4 -L "partname${1?}-1" "${LOOP}p1"
+    udevadm wait --settle --timeout=10 "${LOOP}"
+    udevadm lock --device="${LOOP}" mkfs.ext4 -L "partname${1?}-1" "${LOOP}p1"
 }
 
 check_dependencies() {