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>

diff --git a/tests/functions.sh b/tests/functions.sh
index e84661b0c0470a54bcf5ea06cec1e6fe2f3a68fc..f6c4d33ee8ceae7ee7d03e72f978000d73c16a25 100644 (file)
--- 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 cc1d9cfebbbce88271151b3ec35ea2d77243689b..a6634d5e6143c9e7e90ebe7736fbbb9a83f8c73d 100755 (executable)
--- 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 357cab45a77fa9d296b807105bc830b4fc807530..f05f66163a571bb41348751f41678bba14ff2269 100755 (executable)
--- 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 377982fe7af056d6bbfdbbd53687d3e990e0477f..19fec3a195c51696572cb46ce07a90c8bd89d6b6 100755 (executable)
--- 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 f6c3024af16e7ce746eba73317f93a6a6784a8f1..8b93fe990121c060f9bfb269e02ee1076ba674a2 100755 (executable)
--- 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 7603aa7e4bd9ad00ab6386409934804135507b53..5337d10b25ee1d496be32e9ba7753c9497c38b52 100755 (executable)
--- 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