diff options
| author | Ruediger Meier | 2016-10-21 13:01:55 +0200 |
|---|---|---|
| committer | Ruediger Meier | 2016-10-21 15:08:49 +0200 |
| commit | 5c711ba9453d46815b3c0ec677893a4a6f34d3bd (patch) | |
| tree | a93d43859df367d64f982b7930343236b74afcc0 /tests/ts/mount | |
| parent | getopt: be sure that options array is terminated (diff) | |
| download | kernel-qcow2-util-linux-5c711ba9453d46815b3c0ec677893a4a6f34d3bd.tar.gz kernel-qcow2-util-linux-5c711ba9453d46815b3c0ec677893a4a6f34d3bd.tar.xz kernel-qcow2-util-linux-5c711ba9453d46815b3c0ec677893a4a6f34d3bd.zip | |
tests: consolidate rmmod scsi_debug
- auto cleanup on test exit
- Add smart timeout: Newer openSUSE systems on OBS failed to rmmod
almost always. udevadm settle does not seem to have any affect.
- now tests will fail if rmmod fails
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Diffstat (limited to 'tests/ts/mount')
| -rwxr-xr-x | tests/ts/mount/umount-alltargets | 4 | ||||
| -rwxr-xr-x | tests/ts/mount/umount-recursive | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/tests/ts/mount/umount-alltargets b/tests/ts/mount/umount-alltargets index 53073023a..687229a87 100755 --- a/tests/ts/mount/umount-alltargets +++ b/tests/ts/mount/umount-alltargets @@ -118,9 +118,5 @@ $TS_CMD_UMOUNT --recursive --all-targets ${TS_DEVICE}1 >> $TS_OUTPUT 2>&1 [ $? == 0 ] || ts_log "umount failed" ts_finalize_subtest -udevadm settle -rmmod scsi_debug >> $TS_OUTPUT 2>&1 -[ $? == 0 ] || ts_die "device busy (umount failed?)" - ts_log "Success" ts_finalize diff --git a/tests/ts/mount/umount-recursive b/tests/ts/mount/umount-recursive index 29669a88d..85708554f 100755 --- a/tests/ts/mount/umount-recursive +++ b/tests/ts/mount/umount-recursive @@ -90,10 +90,6 @@ $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" -udevadm settle -rmmod scsi_debug >> $TS_OUTPUT 2>&1 -[ $? == 0 ] || ts_die "device busy (umount failed?)" - ts_log "Success" ts_finalize |