summaryrefslogtreecommitdiffstats
path: root/tests/ts/sfdisk
diff options
context:
space:
mode:
authorRuediger Meier2016-10-21 13:01:55 +0200
committerRuediger Meier2016-10-21 15:08:49 +0200
commit5c711ba9453d46815b3c0ec677893a4a6f34d3bd (patch)
treea93d43859df367d64f982b7930343236b74afcc0 /tests/ts/sfdisk
parentgetopt: be sure that options array is terminated (diff)
downloadkernel-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/sfdisk')
-rwxr-xr-xtests/ts/sfdisk/dos2
-rwxr-xr-xtests/ts/sfdisk/gpt1
-rwxr-xr-xtests/ts/sfdisk/movedata1
-rwxr-xr-xtests/ts/sfdisk/resize1
4 files changed, 0 insertions, 5 deletions
diff --git a/tests/ts/sfdisk/dos b/tests/ts/sfdisk/dos
index 592d6e411..692a71725 100755
--- a/tests/ts/sfdisk/dos
+++ b/tests/ts/sfdisk/dos
@@ -151,6 +151,4 @@ ts_fdisk_clean $TS_DEVICE
udevadm settle
ts_finalize_subtest
-
-rmmod scsi_debug
ts_finalize
diff --git a/tests/ts/sfdisk/gpt b/tests/ts/sfdisk/gpt
index 9656bf964..b1f36a881 100755
--- a/tests/ts/sfdisk/gpt
+++ b/tests/ts/sfdisk/gpt
@@ -165,5 +165,4 @@ udevadm settle
ts_finalize_subtest
-rmmod scsi_debug
ts_finalize
diff --git a/tests/ts/sfdisk/movedata b/tests/ts/sfdisk/movedata
index 64c7371a4..299d6cce8 100755
--- a/tests/ts/sfdisk/movedata
+++ b/tests/ts/sfdisk/movedata
@@ -72,5 +72,4 @@ checksum ${TS_DEVICE}1
ts_finalize_subtest
-rmmod scsi_debug
ts_finalize
diff --git a/tests/ts/sfdisk/resize b/tests/ts/sfdisk/resize
index 8bc3484da..ff58e2de9 100755
--- a/tests/ts/sfdisk/resize
+++ b/tests/ts/sfdisk/resize
@@ -122,5 +122,4 @@ test_label_resize dos
# GPT
test_label_resize gpt
-rmmod scsi_debug
ts_finalize