diff options
| author | Karel Zak | 2012-04-05 15:57:12 +0200 |
|---|---|---|
| committer | Karel Zak | 2012-04-05 15:57:12 +0200 |
| commit | f33fa26e0f7ac68ad09d04bf76a013f8102eccb9 (patch) | |
| tree | ff86ceb77f7432ecb1f685b9d596c546b1e619d2 /tests/ts/eject | |
| parent | eject: use BUILD_EJECT, move to sys-utils (diff) | |
| download | kernel-qcow2-util-linux-f33fa26e0f7ac68ad09d04bf76a013f8102eccb9.tar.gz kernel-qcow2-util-linux-f33fa26e0f7ac68ad09d04bf76a013f8102eccb9.tar.xz kernel-qcow2-util-linux-f33fa26e0f7ac68ad09d04bf76a013f8102eccb9.zip | |
tests: use eject --force
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests/ts/eject')
| -rwxr-xr-x | tests/ts/eject/umount | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/tests/ts/eject/umount b/tests/ts/eject/umount index 28f286cc9..3081c1f18 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 |