diff options
| author | Karel Zak | 2013-04-12 13:49:08 +0200 |
|---|---|---|
| committer | Karel Zak | 2013-04-12 14:02:39 +0200 |
| commit | 188d9656c3819a12059cfe826b4c78b9383c6a68 (patch) | |
| tree | 015497143f5062339ba4d09bf498087fe560e93f /tests/ts/mount | |
| parent | libmount: fix mount.nfs segfault, rely on assert() rather than on nonnull (diff) | |
| download | kernel-qcow2-util-linux-188d9656c3819a12059cfe826b4c78b9383c6a68.tar.gz kernel-qcow2-util-linux-188d9656c3819a12059cfe826b4c78b9383c6a68.tar.xz kernel-qcow2-util-linux-188d9656c3819a12059cfe826b4c78b9383c6a68.zip | |
tests: use udevadm settle rather than sleep
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests/ts/mount')
| -rwxr-xr-x | tests/ts/mount/umount-alltargets | 6 | ||||
| -rwxr-xr-x | tests/ts/mount/umount-recursive | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/tests/ts/mount/umount-alltargets b/tests/ts/mount/umount-alltargets index 071372bca..3c5731af0 100755 --- a/tests/ts/mount/umount-alltargets +++ b/tests/ts/mount/umount-alltargets @@ -50,6 +50,8 @@ w q EOF +udevadm settle + ts_log "Create filesystem A" mkfs.ext2 ${DEVICE}1 &> /dev/null ts_log "Create filesystem B" @@ -59,6 +61,8 @@ mkfs.ext2 ${DEVICE}3 &> /dev/null ts_log "Create filesystem D" mkfs.ext2 ${DEVICE}4 &> /dev/null +udevadm settle + function multi_mount() { local DEV=$1 local MNT=$2 @@ -113,7 +117,7 @@ $TS_CMD_UMOUNT --recursive --all-targets ${DEVICE}1 >> $TS_OUTPUT 2>&1 [ $? == 0 ] || ts_log "umount failed" ts_finalize_subtest -sleep 3 +udevadm settle rmmod scsi_debug >> $TS_OUTPUT 2>&1 [ $? == 0 ] || ts_die "device busy (umount failed?)" diff --git a/tests/ts/mount/umount-recursive b/tests/ts/mount/umount-recursive index 53b0b39e0..13a075f67 100755 --- a/tests/ts/mount/umount-recursive +++ b/tests/ts/mount/umount-recursive @@ -50,6 +50,8 @@ w q EOF +udevadm settle + ts_log "Create filesystem A" mkfs.ext2 ${DEVICE}1 &> /dev/null ts_log "Create filesystem B" @@ -59,6 +61,7 @@ mkfs.ext2 ${DEVICE}3 &> /dev/null ts_log "Create filesystem D" mkfs.ext2 ${DEVICE}4 &> /dev/null +udevadm settle ts_log "Do tests..." @@ -90,7 +93,7 @@ $TS_CMD_MOUNT --bind $TS_MOUNTPOINT/mntB/mntC $TS_MOUNTPOINT/bindC $TS_CMD_UMOUNT --recursive $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1 [ $? == 0 ] || ts_die "umount failed" -sleep 3 +udevadm settle rmmod scsi_debug >> $TS_OUTPUT 2>&1 [ $? == 0 ] || ts_die "device busy (umount failed?)" |