From 01b38917ad2006f71748b8c1e326db9eaf45867d Mon Sep 17 00:00:00 2001 From: Ruediger Meier Date: Tue, 15 Dec 2015 16:43:29 +0100 Subject: [PATCH] tests: no more sleep, udevadm settle only This seems to work nowadays and saves 37s. Signed-off-by: Ruediger Meier --- tests/functions.sh | 1 - tests/ts/eject/umount | 1 - tests/ts/libmount/context | 1 - tests/ts/libmount/context-py | 1 - tests/ts/libmount/context-utab | 1 - tests/ts/libmount/context-utab-py | 1 - 6 files changed, 6 deletions(-) diff --git a/tests/functions.sh b/tests/functions.sh index e84661b0c0..f6c4d33ee8 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 cc1d9cfebb..a6634d5e61 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 357cab45a7..f05f66163a 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 377982fe7a..19fec3a195 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 f6c3024af1..8b93fe9901 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 7603aa7e4b..5337d10b25 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 -- 2.39.5