diff options
| author | Ruediger Meier | 2018-03-07 17:16:28 +0100 |
|---|---|---|
| committer | Ruediger Meier | 2018-03-07 18:36:11 +0100 |
| commit | 80ea6e24f33bedc01e9c0b3dead27f5374d927b4 (patch) | |
| tree | f5372ec5aa01a29dc080e13ac85b5eda7a869b08 /tests/ts/mount | |
| parent | travis: enable osx root checks (diff) | |
| download | kernel-qcow2-util-linux-80ea6e24f33bedc01e9c0b3dead27f5374d927b4.tar.gz kernel-qcow2-util-linux-80ea6e24f33bedc01e9c0b3dead27f5374d927b4.tar.xz kernel-qcow2-util-linux-80ea6e24f33bedc01e9c0b3dead27f5374d927b4.zip | |
tests: add some more udevadm settle
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Diffstat (limited to 'tests/ts/mount')
| -rwxr-xr-x | tests/ts/mount/label | 2 | ||||
| -rwxr-xr-x | tests/ts/mount/umount-alltargets | 2 | ||||
| -rwxr-xr-x | tests/ts/mount/umount-recursive | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/tests/ts/mount/label b/tests/ts/mount/label index 09f598e12..d3a571bc4 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 687229a87..69799de77 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 85708554f..547217e3a 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" |