summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRuediger Meier2015-12-15 16:43:29 +0100
committerKarel Zak2016-01-05 12:21:55 +0100
commit01b38917ad2006f71748b8c1e326db9eaf45867d (patch)
treef85a54f6093dcc07ec215e1bd480ed5c768cb8fc /tests
parenttests: use sfdisk --no-reread wherever it's needed (diff)
downloadkernel-qcow2-util-linux-01b38917ad2006f71748b8c1e326db9eaf45867d.tar.gz
kernel-qcow2-util-linux-01b38917ad2006f71748b8c1e326db9eaf45867d.tar.xz
kernel-qcow2-util-linux-01b38917ad2006f71748b8c1e326db9eaf45867d.zip
tests: no more sleep, udevadm settle only
This seems to work nowadays and saves 37s. Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Diffstat (limited to 'tests')
-rw-r--r--tests/functions.sh1
-rwxr-xr-xtests/ts/eject/umount1
-rwxr-xr-xtests/ts/libmount/context1
-rwxr-xr-xtests/ts/libmount/context-py1
-rwxr-xr-xtests/ts/libmount/context-utab1
-rwxr-xr-xtests/ts/libmount/context-utab-py1
6 files changed, 0 insertions, 6 deletions
diff --git a/tests/functions.sh b/tests/functions.sh
index e84661b0c..f6c4d33ee 100644
--- a/tests/functions.sh
+++ b/tests/functions.sh
@@ -641,7 +641,6 @@ function ts_scsi_debug_init {
lsmod | grep -q "^scsi_debug " \
|| ts_skip "scsi_debug module not loaded (lsmod)"
- sleep 1
udevadm settle
devname=$(grep --with-filename scsi_debug /sys/block/*/device/model | awk -F '/' '{print $4}')
diff --git a/tests/ts/eject/umount b/tests/ts/eject/umount
index cc1d9cfeb..a6634d5e6 100755
--- a/tests/ts/eject/umount
+++ b/tests/ts/eject/umount
@@ -48,7 +48,6 @@ EOF
function deinit_device {
udevadm settle
- sleep 1
rmmod scsi_debug
}
diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context
index 357cab45a..f05f66163 100755
--- a/tests/ts/libmount/context
+++ b/tests/ts/libmount/context
@@ -53,7 +53,6 @@ EOF
DEVICE="${TS_DEVICE}1"
-sleep 1
udevadm settle
grep -q $DEVNAME /proc/partitions
diff --git a/tests/ts/libmount/context-py b/tests/ts/libmount/context-py
index 377982fe7..19fec3a19 100755
--- a/tests/ts/libmount/context-py
+++ b/tests/ts/libmount/context-py
@@ -55,7 +55,6 @@ EOF
DEVICE="${TS_DEVICE}1"
-sleep 1
udevadm settle
grep -q $DEVNAME /proc/partitions
diff --git a/tests/ts/libmount/context-utab b/tests/ts/libmount/context-utab
index f6c3024af..8b93fe990 100755
--- a/tests/ts/libmount/context-utab
+++ b/tests/ts/libmount/context-utab
@@ -40,7 +40,6 @@ EOF
DEVICE="${TS_DEVICE}1"
-sleep 1
udevadm settle
grep -q $DEVNAME /proc/partitions
diff --git a/tests/ts/libmount/context-utab-py b/tests/ts/libmount/context-utab-py
index 7603aa7e4..5337d10b2 100755
--- a/tests/ts/libmount/context-utab-py
+++ b/tests/ts/libmount/context-utab-py
@@ -41,7 +41,6 @@ EOF
DEVICE="${TS_DEVICE}1"
-sleep 1
udevadm settle
grep -q $DEVNAME /proc/partitions