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/fdisk | |
| 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/fdisk')
| -rwxr-xr-x | tests/ts/fdisk/align-512-4K | 2 | ||||
| -rwxr-xr-x | tests/ts/fdisk/align-512-4K-63 | 1 | ||||
| -rwxr-xr-x | tests/ts/fdisk/align-512-4K-md | 3 | ||||
| -rwxr-xr-x | tests/ts/fdisk/align-512-512-topology | 2 |
4 files changed, 0 insertions, 8 deletions
diff --git a/tests/ts/fdisk/align-512-4K b/tests/ts/fdisk/align-512-4K index bdfb5ceca..c312e34f1 100755 --- a/tests/ts/fdisk/align-512-4K +++ b/tests/ts/fdisk/align-512-4K @@ -73,8 +73,6 @@ udevadm settle ts_log "Alignment offsets:" cat /sys/block/${DEVNAME}/${DEVNAME}{1,2,3,4,5,6,7}/alignment_offset >> $TS_OUTPUT 2>&1 -rmmod scsi_debug - ts_fdisk_clean $TS_DEVICE ts_finalize diff --git a/tests/ts/fdisk/align-512-4K-63 b/tests/ts/fdisk/align-512-4K-63 index e259b5a0a..b84780bda 100755 --- a/tests/ts/fdisk/align-512-4K-63 +++ b/tests/ts/fdisk/align-512-4K-63 @@ -73,7 +73,6 @@ udevadm settle ts_log "Alignment offsets:" cat /sys/block/${DEVNAME}/${DEVNAME}{1,2,3,4,5,6,7}/alignment_offset >> $TS_OUTPUT 2>&1 -rmmod scsi_debug ts_fdisk_clean $TS_DEVICE diff --git a/tests/ts/fdisk/align-512-4K-md b/tests/ts/fdisk/align-512-4K-md index 11a67699b..04c3df68e 100755 --- a/tests/ts/fdisk/align-512-4K-md +++ b/tests/ts/fdisk/align-512-4K-md @@ -87,9 +87,6 @@ cat /sys/block/${MD_DEVNAME}/${MD_DEVNAME}p{1,2}/alignment_offset >> $TS_OUTPUT mdadm -q -S ${MD_DEVICE} >> $TS_OUTPUT 2>&1 -udevadm settle -rmmod scsi_debug - ts_fdisk_clean $TS_DEVICE ts_fdisk_clean $MD_DEVICE diff --git a/tests/ts/fdisk/align-512-512-topology b/tests/ts/fdisk/align-512-512-topology index d291e2f97..802ea61c2 100755 --- a/tests/ts/fdisk/align-512-512-topology +++ b/tests/ts/fdisk/align-512-512-topology @@ -73,8 +73,6 @@ udevadm settle ts_log "Alignment offsets:" cat /sys/block/${DEVNAME}/${DEVNAME}{1,2,3,4,5,6,7}/alignment_offset >> $TS_OUTPUT 2>&1 -rmmod scsi_debug - ts_fdisk_clean $TS_DEVICE ts_finalize |