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/blkid | |
| 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/blkid')
| -rwxr-xr-x | tests/ts/blkid/mbr-wholedisk | 1 | ||||
| -rwxr-xr-x | tests/ts/blkid/md-raid1-part | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/tests/ts/blkid/mbr-wholedisk b/tests/ts/blkid/mbr-wholedisk index 98c9df1b5..239592e56 100755 --- a/tests/ts/blkid/mbr-wholedisk +++ b/tests/ts/blkid/mbr-wholedisk @@ -39,5 +39,4 @@ udevadm settle $TS_CMD_BLKID -p -o udev ${TS_DEVICE} >> $TS_OUTPUT ts_finalize_subtest -rmmod scsi_debug ts_finalize diff --git a/tests/ts/blkid/md-raid1-part b/tests/ts/blkid/md-raid1-part index ce3a687c7..9f1276186 100755 --- a/tests/ts/blkid/md-raid1-part +++ b/tests/ts/blkid/md-raid1-part @@ -79,8 +79,6 @@ $TS_CMD_BLKID -p -o udev ${TS_DEVICE}2 2>&1 | sort >> $TS_OUTPUT mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>&1 -udevadm settle -rmmod scsi_debug ts_fdisk_clean $TS_DEVICE # substitue UUIDs and major/minor number before comparison |