From: NeilBrown Date: Wed, 1 Apr 2009 02:51:57 +0000 (+1100) Subject: ism-tests: fix the imsm-create-fail-rebuild test X-Git-Tag: mdadm-3.0-rc1~52 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37353437daabcf05eb389782f61b90ae181b8979;p=thirdparty%2Fmdadm.git ism-tests: fix the imsm-create-fail-rebuild test it was testing the return status of mdadm wrongly, and I found I needed a 'udevadm settle'. --- diff --git a/tests/env-09imsm-create-fail-rebuild b/tests/env-09imsm-create-fail-rebuild index 2fc90edc..b44746c5 100644 --- a/tests/env-09imsm-create-fail-rebuild +++ b/tests/env-09imsm-create-fail-rebuild @@ -1,5 +1,5 @@ imsm_check_hold() { - if [ mdadm --remove $1 $2 -eq 0 ]; then + if mdadm --remove $1 $2; then echo "$2 removal from $1 should have been blocked" >&2 cat /proc/mdstat >&2 mdadm -E $2 @@ -8,7 +8,7 @@ imsm_check_hold() { } imsm_check_removal() { - if [ mdadm --remove $1 $2 -ne 0 ]; then + if ! mdadm --remove $1 $2 ; then echo "$2 removal from $1 should have succeeded" >&2 cat /proc/mdstat >&2 mdadm -E $2 @@ -17,6 +17,7 @@ imsm_check_removal() { } imsm_check() { + udevadm settle case $1 in container ) grep -s "$(((418 * $2)/2)) blocks super external:imsm" /proc/mdstat > /dev/null || {