summaryrefslogtreecommitdiffstats
path: root/tests/ts/eject
diff options
context:
space:
mode:
authorKarel Zak2013-04-12 13:49:08 +0200
committerKarel Zak2013-04-12 14:02:39 +0200
commit188d9656c3819a12059cfe826b4c78b9383c6a68 (patch)
tree015497143f5062339ba4d09bf498087fe560e93f /tests/ts/eject
parentlibmount: fix mount.nfs segfault, rely on assert() rather than on nonnull (diff)
downloadkernel-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/eject')
-rwxr-xr-xtests/ts/eject/umount7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/ts/eject/umount b/tests/ts/eject/umount
index 3081c1f18..20f4e1238 100755
--- a/tests/ts/eject/umount
+++ b/tests/ts/eject/umount
@@ -48,13 +48,14 @@ p
p
w
EOF
- sleep 1
+ udevadm settle
mkfs.ext2 -q ${dev}1
mkfs.ext2 -q ${dev}2
+ udevadm settle
}
function deinit_device {
- sleep 3
+ udevadm settle
rmmod scsi_debug
}
@@ -68,9 +69,9 @@ ts_finalize_subtest
ts_init_subtest "by-disk-mounted"
DEVICE=$(init_device)
mkfs.ext2 -q -F $DEVICE
+udevadm settle
mkdir -p $TS_MOUNTPOINT
mount $DEVICE $TS_MOUNTPOINT
-sleep 1
$TS_CMD_EJECT --force $DEVICE && ts_log "Success"
deinit_device
ts_finalize_subtest