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/libmount/context | |
| 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/libmount/context')
| -rwxr-xr-x | tests/ts/libmount/context | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context index c3b0b6dea..c1c1fb74b 100755 --- a/tests/ts/libmount/context +++ b/tests/ts/libmount/context @@ -35,6 +35,7 @@ DEVNAME=$(grep scsi_debug /sys/block/*/device/model | awk -F '/' '{print $4}') [ "x${DEVNAME}" == "x" ] && ts_die "Cannot find device" DEVICE="/dev/${DEVNAME}" +udevadm settle ts_log "Create partitions" $TS_CMD_FDISK ${DEVICE} >> /dev/null 2>&1 <<EOF @@ -48,8 +49,7 @@ q EOF DEVICE="/dev/${DEVNAME}1" - -sleep 3 +udevadm settle ts_log "Create filesystem" mkfs.ext4 -L "$LABEL" -U "$UUID" $DEVICE &> /dev/null @@ -59,6 +59,7 @@ ts_log "Do tests..." export LIBMOUNT_MTAB=$TS_OUTPUT.mtab > $LIBMOUNT_MTAB +udevadm settle ts_init_subtest "mount-by-devname" mkdir -p $MOUNTPOINT &> /dev/null @@ -74,7 +75,6 @@ grep -q $DEVICE $LIBMOUNT_MTAB && echo "umount (device) failed: found $DEVICE in $LIBMOUNT_MTAB" >> $TS_OUTPUT 2>&1 ts_finalize_subtest -#exit 1 ts_init_subtest "mount-by-label" mkdir -p $MOUNTPOINT &> /dev/null @@ -122,9 +122,12 @@ ts_init_subtest "mount-loopdev" mkdir -p $MOUNTPOINT &> /dev/null img=$(ts_image_init) mkfs.ext3 -F $img &> /dev/null +udevadm settle + ts_valgrind $TESTPROG --mount -o loop $img $MOUNTPOINT >> $TS_OUTPUT 2>&1 grep -q $MOUNTPOINT $LIBMOUNT_MTAB || \ echo "(loopdev) cannot find $MOUNTPOINT in $LIBMOUNT_MTAB" >> $TS_OUTPUT 2>&1 +udevadm settle ts_valgrind $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 grep -q $MOUNTPOINT $LIBMOUNT_MTAB && echo "umount failed: found $MOUNTPOINT in $LIBMOUNT_MTAB" >> $TS_OUTPUT 2>&1 |