From: Ruediger Meier <ruediger.meier@ga-group.nl>
Date: Wed, 7 Mar 2018 16:16:28 +0000 (+0100)
Subject: tests: add some more udevadm settle
X-Git-Tag: v2.32~47
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=80ea6e24f33bedc01e9c0b3dead27f5374d927b4;p=thirdparty%2Futil-linux.git

tests: add some more udevadm settle

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---

diff --git a/tests/ts/minix/mkfs b/tests/ts/minix/mkfs
index 7af0b109a4..6c3a00247e 100755
--- a/tests/ts/minix/mkfs
+++ b/tests/ts/minix/mkfs
@@ -41,6 +41,7 @@ mkfs_and_mount_minix() {
 	ts_mount "minix" $dev $TS_MOUNTPOINT
 	ts_is_mounted $dev || ts_die "Cannot find $dev in /proc/mounts"
 	ts_log "umount the image"
+	udevadm settle
 	$TS_CMD_UMOUNT $dev
 	ts_finalize_subtest
 }
diff --git a/tests/ts/mount/label b/tests/ts/mount/label
index 09f598e125..d3a571bc4c 100755
--- a/tests/ts/mount/label
+++ b/tests/ts/mount/label
@@ -34,7 +34,7 @@ ts_device_init
 DEVICE=$TS_LODEV
 
 mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
-
+udevadm settle
 ts_device_has "LABEL" $LABEL $DEVICE \
  || ts_die "Cannot find LABEL '$LABEL' on $DEVICE"
 
diff --git a/tests/ts/mount/umount-alltargets b/tests/ts/mount/umount-alltargets
index 687229a879..69799de77e 100755
--- a/tests/ts/mount/umount-alltargets
+++ b/tests/ts/mount/umount-alltargets
@@ -79,6 +79,8 @@ function multi_mount() {
 	ts_log "prepare: Mount /dev/xxx1 to mnt3"
 	[ -d "${MNT}3" ] || mkdir -p ${MNT}3
 	$TS_CMD_MOUNT $DEV ${MNT}3 >> $TS_OUTPUT 2>&1
+
+	udevadm settle
 }
 
 # use the same top-level mountpoint for all sub-tests
diff --git a/tests/ts/mount/umount-recursive b/tests/ts/mount/umount-recursive
index 85708554fb..547217e3ae 100755
--- a/tests/ts/mount/umount-recursive
+++ b/tests/ts/mount/umount-recursive
@@ -87,6 +87,7 @@ ts_log "E) Mount child-bind"
 mkdir -p $TS_MOUNTPOINT/bindC
 $TS_CMD_MOUNT --bind $TS_MOUNTPOINT/mntB/mntC $TS_MOUNTPOINT/bindC
 
+udevadm settle
 $TS_CMD_UMOUNT --recursive $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1
 [ $? == 0 ] || ts_die "umount failed"
 
diff --git a/tests/ts/swapon/label b/tests/ts/swapon/label
index bbcd771bed..056953a290 100755
--- a/tests/ts/swapon/label
+++ b/tests/ts/swapon/label
@@ -35,6 +35,8 @@ DEVICE=$TS_LODEV
 $TS_CMD_MKSWAP -L $LABEL $DEVICE > /dev/null 2>> $TS_OUTPUT \
  || ts_die "Cannot make swap on $DEVICE"
 
+udevadm settle
+
 ts_device_has "LABEL" $LABEL $DEVICE \
  || ts_die "Cannot find LABEL '$LABEL' on $DEVICE"