Partial revert "tests: update to md dev name"

This partially reverts commit c2ff8876f97a5840cd9d6fcda1bec55ef6220dc3.

Not all MD devices are stopped. Something is missing there...

diff --git a/test/lib/aux.sh b/test/lib/aux.sh
index 566e9b52e157386431b5811e25e3428080032aee..19365cd718232393fb45724d738a3f3dedfe8521 100644 (file)
--- a/test/lib/aux.sh
+++ b/test/lib/aux.sh
@@ -421,15 +421,13 @@ teardown_devs() {
        teardown_udev_cookies
 
        test ! -f MD_DEV || cleanup_md_dev
-
-       test ! -f WAIT_MD_DEV || mddev=$(< WAIT_MD_DEV)
        udev_wait
-       test ! -f WAIT_MD_DEV || mdadm --stop $mddev || true
+       mdadm --stop --scan || true
        udev_wait
        test ! -f DEVICES || teardown_devs_prefixed "$PREFIX"
        test ! -f RAMDISK || { modprobe -r brd || true ; }
 
-       test ! -f WAIT_MD_DEV || mdadm --stop $mddev || true
+       mdadm --stop --scan || true
 
        # NOTE: SCSI_DEBUG_DEV test must come before the LOOP test because
        # prepare_scsi_debug_dev() also sets LOOP to short-circuit prepare_loop()
@@ -794,7 +792,6 @@ wait_md_create() {
                        break
                fi
        done
-       echo "$md" > WAIT_MD_DEV
 }
 
 wipefs_a() {

diff --git a/test/shell/duplicate-pvs-md0.sh b/test/shell/duplicate-pvs-md0.sh
index 21f1442b299787179b57610582c977a9d2458c64..036f5707c555acfc67f399662e65a7de618c61c1 100644 (file)
--- a/test/shell/duplicate-pvs-md0.sh
+++ b/test/shell/duplicate-pvs-md0.sh
@@ -369,6 +369,7 @@ aux aux udev_wait
 cat /proc/mdstat
 # for some reason enabling dev2 starts an odd md dev
 mdadm --stop "$mddev" || true
+mdadm --stop --scan
 cat /proc/mdstat
 aux wipefs_a "$dev1" || true
 aux wipefs_a "$dev2" || true
@@ -434,6 +435,7 @@ aux aux udev_wait
 cat /proc/mdstat
 # for some reason enabling dev2 starts an odd md dev
 mdadm --stop "$mddev" || true
+mdadm --stop --scan
 cat /proc/mdstat
 aux wipefs_a "$dev1" || true
 aux wipefs_a "$dev2" || true

diff --git a/test/shell/duplicate-pvs-md1.sh b/test/shell/duplicate-pvs-md1.sh
index be223df30d37874936ed07929ecdbd53f0743e8a..64d9b98efba3963dddee2018e2bd02355c772448 100644 (file)
--- a/test/shell/duplicate-pvs-md1.sh
+++ b/test/shell/duplicate-pvs-md1.sh
@@ -416,6 +416,7 @@ aux udev_wait
 cat /proc/mdstat
 # for some reason enabling dev2 starts an odd md dev
 mdadm --stop "$mddev" || true
+mdadm --stop --scan
 cat /proc/mdstat
 aux wipefs_a "$dev1" || true
 aux wipefs_a "$dev2" || true
@@ -480,6 +481,7 @@ aux udev_wait
 cat /proc/mdstat
 # for some reason enabling dev2 starts an odd md dev
 mdadm --stop "$mddev" || true
+mdadm --stop --scan
 cat /proc/mdstat
 aux wipefs_a "$dev1" || true
 aux wipefs_a "$dev2" || true
@@ -618,6 +620,7 @@ aux udev_wait
 cat /proc/mdstat
 # for some reason enabling dev2 starts an odd md dev
 mdadm --stop "$mddev" || true
+mdadm --stop --scan
 cat /proc/mdstat
 aux wipefs_a "$dev1" || true
 aux wipefs_a "$dev2" || true