diff options
| author | David Teigland <teigland@redhat.com> | 2019-10-02 12:51:17 -0500 |
|---|---|---|
| committer | Marian Csontos <mcsontos@redhat.com> | 2019-11-26 10:34:51 +0100 |
| commit | bbd8badaef630c3534ccd1ae27602b66c37d5c6e (patch) | |
| tree | d9e184e03fdee9324073a8784399251042621efe | |
| parent | b6902585187e9a7e29fb57d8415743db1bf80dab (diff) | |
| download | lvm2-bbd8badaef630c3534ccd1ae27602b66c37d5c6e.tar.gz | |
tests: update to md dev name
Restore WAIT_MD_DEV in teardown.
NOTE: The name of MD device may have changed.
(cherry picked from commit c2ff8876f97a5840cd9d6fcda1bec55ef6220dc3)
| -rw-r--r-- | test/lib/aux.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/test/lib/aux.sh b/test/lib/aux.sh index 19365cd71..566e9b52e 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -421,13 +421,15 @@ teardown_devs() { teardown_udev_cookies test ! -f MD_DEV || cleanup_md_dev + + test ! -f WAIT_MD_DEV || mddev=$(< WAIT_MD_DEV) udev_wait - mdadm --stop --scan || true + test ! -f WAIT_MD_DEV || mdadm --stop $mddev || true udev_wait test ! -f DEVICES || teardown_devs_prefixed "$PREFIX" test ! -f RAMDISK || { modprobe -r brd || true ; } - mdadm --stop --scan || true + test ! -f WAIT_MD_DEV || mdadm --stop $mddev || 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() @@ -792,6 +794,7 @@ wait_md_create() { break fi done + echo "$md" > WAIT_MD_DEV } wipefs_a() { |