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 7af0b109a4fff0aa32aadedb096275129fe360eb..6c3a00247e230627c28fde4e3f020ffa1153f1f1 100755 (executable)
--- 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 09f598e12545f50c75b030a8525c0e84457ed2e7..d3a571bc4c1233c9645db995327e9e9d96324e99 100755 (executable)
--- 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 687229a879787c2f17a65b40c8f1b0bbf642d990..69799de77e20e1842b3c63aafefd464df0d3a0b1 100755 (executable)
--- 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 85708554fbda1cd1914dd95c637a1c57037c6ed3..547217e3ae58ce7c4131d5416a13443bc3c7180a 100755 (executable)
--- 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 bbcd771bed6604e330fff00e3f3d92f778f18e32..056953a290fb03f15e97b0a8a0211a308f2c5c60 100755 (executable)
--- 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"