block: settle udev before removing null_blk module

prevent "modprobe: FATAL: Module null_blk is in use." errors.

Signed-off-by: Gioh Kim <gi-oh.kim@profitbricks.com>

diff --git a/tests/block/006 b/tests/block/006
index a5f1310d8ad7b0ce21b132263547623676b68ac3..2836a1d0508a9b228492eabd2b42cef7236cf30e 100755 (executable)
--- a/tests/block/006
+++ b/tests/block/006
@@ -49,6 +49,7 @@ test() {
                --rw=randread --norandommap --name=async \
                --filename=/dev/nullb0 --size=5g --direct=1
 
+       udevadm settle
        modprobe -r null_blk
 
        echo "Test complete"

diff --git a/tests/block/010 b/tests/block/010
index 5b54e71a53f7be8f5d9d0a46a85aff6c47e5daf6..7f4bf84edadd81a13e3ea21ba16833cd9c78db12 100644 (file)
--- a/tests/block/010
+++ b/tests/block/010
@@ -69,6 +69,7 @@ test() {
        FIO_PERF_FIELDS=("read iops")
        run_fio_job
 
+       udevadm settle
        modprobe -r null_blk
        if ! modprobe null_blk queue_mode=2 submit_queues=16 nr_devices=32 shared_tags=1; then
                return 1
@@ -78,6 +79,7 @@ test() {
        FIO_PERF_FIELDS=("read iops")
        run_fio_job
 
+       udevadm settle
        modprobe -r null_blk
        echo "Test complete"
 }

diff --git a/tests/block/014 b/tests/block/014
index b32d88266550980f939feb87f67ed76fe5012f66..7f7798026ae6f6bef495e2c99db6604e871c78a9 100755 (executable)
--- a/tests/block/014
+++ b/tests/block/014
@@ -51,6 +51,7 @@ test() {
                wait
        done
 
+       udevadm settle
        modprobe -r null_blk
 
        echo "Test complete"

diff --git a/tests/block/015 b/tests/block/015
index c44d4da657d8a15088d29c54406f83681f3bbea9..9b0afcd93f92ad2a125f4414571abe153e0c3122 100755 (executable)
--- a/tests/block/015
+++ b/tests/block/015
@@ -47,6 +47,7 @@ test() {
                        iflag=direct status=none
        done
 
+       udevadm settle
        modprobe -r null_blk
 
        echo "Test complete"

diff --git a/tests/block/016 b/tests/block/016
index bef3aa4a1be2c9da5272a691760455455ccafdb0..72150bef11c48db95fecf47ce4f6eb058f338c44 100755 (executable)
--- a/tests/block/016
+++ b/tests/block/016
@@ -53,6 +53,7 @@ test() {
        kill -USR1 $!
        wait
 
+       udevadm settle
        modprobe -r null_blk
 
        echo "Test complete"

diff --git a/tests/block/017 b/tests/block/017
index e1a8afde89bbefb7f78549c9aee6d8955002676f..c38b6ea097f9beca6296ba14ec592ff32b54b3e6 100755 (executable)
--- a/tests/block/017
+++ b/tests/block/017
@@ -58,6 +58,7 @@ test() {
                wait
                show_inflight
 
+               udevadm settle
                modprobe -r null_blk
        done
 

diff --git a/tests/block/018 b/tests/block/018
index 53cf58462d00a73fb1658005edb9eff80d09ed86..3cf8f8602757de3909172344159cb65367025077 100755 (executable)
--- a/tests/block/018
+++ b/tests/block/018
@@ -69,6 +69,7 @@ test() {
                wait
                show_times
 
+               udevadm settle
                modprobe -r null_blk
 
                unset init_read_ms init_write_ms read_ms write_ms

diff --git a/tests/block/020 b/tests/block/020
index a744f6480bf99e5d8e04fe2c47e56125421eb3ea..6fe9ee9e3c3a73d2fc1b7f15056f5d4a4e9381ca 100755 (executable)
--- a/tests/block/020
+++ b/tests/block/020
@@ -48,6 +48,7 @@ test() {
                        --runtime=10
        done
 
+       udevadm settle
        modprobe -r null_blk
 
        echo "Test complete"

diff --git a/tests/block/021 b/tests/block/021
index 3210f58ef27ceea5b7cff7fb622233afd8ebead3..dfdfda22e34f144568581a2eb2610a89db52e518 100755 (executable)
--- a/tests/block/021
+++ b/tests/block/021
@@ -49,6 +49,7 @@ test() {
                done
        done
 
+       udevadm settle
        modprobe -r null_blk
 
        echo "Test complete"

diff --git a/tests/block/022 b/tests/block/022
index ad39ebe8073fbb75569151dd8d68ff8763df0bfa..1cb3ddfd78af2da41e7b396b8014b0a289a3dfd9 100755 (executable)
--- a/tests/block/022
+++ b/tests/block/022
@@ -51,6 +51,7 @@ test() {
                wait
        done
 
+       udevadm settle
        modprobe -r null_blk
 
        echo "Test complete"