From f33fa26e0f7ac68ad09d04bf76a013f8102eccb9 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 5 Apr 2012 15:57:12 +0200 Subject: [PATCH] tests: use eject --force Signed-off-by: Karel Zak --- tests/commands.sh.in | 2 +- tests/ts/eject/umount | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/tests/commands.sh.in b/tests/commands.sh.in index 7e34f7a2fa..b01ebc7296 100644 --- a/tests/commands.sh.in +++ b/tests/commands.sh.in @@ -62,7 +62,7 @@ TS_CMD_NAMEI=${TS_CMD_NAMEI-"$top_builddir/misc-utils/namei"} TS_CMD_LOOK=${TS_CMD_LOOK-"$top_builddir/misc-utils/look"} TS_CMD_CAL=${TS_CMD_CAL-"$top_builddir/misc-utils/cal"} TS_CMD_SCRIPT=${TS_CMD_SCRIPT-"$top_builddir/term-utils/script"} -TS_CMD_EJECT=${TS_CMD_EJECT-"$top_builddir/misc-utils/eject"} +TS_CMD_EJECT=${TS_CMD_EJECT-"$top_builddir/sys-utils/eject"} TS_CMD_HWCLOCK=${TS_CMD_HWCLOCK-"$top_builddir/hwclock/hwclock"} diff --git a/tests/ts/eject/umount b/tests/ts/eject/umount index 28f286cc91..3081c1f18e 100755 --- a/tests/ts/eject/umount +++ b/tests/ts/eject/umount @@ -7,6 +7,11 @@ TS_DESC="umount" ts_init "$*" ts_skip_nonroot +# +# Note that eject --force is required because scsi_debug is +# not removable device. +# + modprobe --dry-run --quiet scsi_debug [ "$?" == 0 ] || ts_skip "missing scsi_debug module" @@ -56,7 +61,7 @@ function deinit_device { ts_init_subtest "by-disk" DEVICE=$(init_device) -$TS_CMD_EJECT $DEVICE && ts_log "Success" +$TS_CMD_EJECT --force $DEVICE && ts_log "Success" deinit_device ts_finalize_subtest @@ -66,7 +71,7 @@ mkfs.ext2 -q -F $DEVICE mkdir -p $TS_MOUNTPOINT mount $DEVICE $TS_MOUNTPOINT sleep 1 -$TS_CMD_EJECT $DEVICE && ts_log "Success" +$TS_CMD_EJECT --force $DEVICE && ts_log "Success" deinit_device ts_finalize_subtest @@ -78,7 +83,7 @@ mkdir -p ${TS_MOUNTPOINT}1 mkdir -p ${TS_MOUNTPOINT}2 mount ${DEVICE}1 ${TS_MOUNTPOINT}1 mount ${DEVICE}2 ${TS_MOUNTPOINT}2 -$TS_CMD_EJECT $DEVICE && ts_log "Success" +$TS_CMD_EJECT --force $DEVICE && ts_log "Success" deinit_device ts_finalize_subtest @@ -86,7 +91,7 @@ ts_finalize_subtest ts_init_subtest "by-partition" DEVICE=$(init_device) init_partitions $DEVICE -$TS_CMD_EJECT ${DEVICE}1 && ts_log "Success" +$TS_CMD_EJECT --force ${DEVICE}1 && ts_log "Success" deinit_device ts_finalize_subtest @@ -98,7 +103,7 @@ mkdir -p ${TS_MOUNTPOINT}1 mkdir -p ${TS_MOUNTPOINT}2 mount ${DEVICE}1 ${TS_MOUNTPOINT}1 mount ${DEVICE}2 ${TS_MOUNTPOINT}2 -$TS_CMD_EJECT ${DEVICE}1 && ts_log "Success" +$TS_CMD_EJECT --force ${DEVICE}1 && ts_log "Success" deinit_device ts_finalize_subtest -- 2.47.3