tests: never fail if --wait fails.

"--wait" will return non-zero status if it didn't need to wait.
This is no a reason to fail a test.

So ignore the return status from those commands.

Signed-off-by: NeilBrown <neilb@suse.de>

diff --git a/tests/04update-metadata b/tests/04update-metadata
index 10bb70f0f3ea66150423264882f7cbd80e10c9fc..232fc1ffff4be7babad8c54bb76165b4a5099fba 100644 (file)
--- a/tests/04update-metadata
+++ b/tests/04update-metadata
@@ -32,7 +32,7 @@ then echo >&2 should fail during resync
      exit 1
 fi
 mdadm -A $md0 $dlist
-mdadm --wait $md0
+mdadm --wait $md0 || true
 mdadm -S $md0
 
 # should succeed now

diff --git a/tests/09imsm-assemble b/tests/09imsm-assemble
index 2a42369e349f602bcc1a770e2f0aff6e84d99d33..d7028c6261366396bea7930338e9c15157eb12f0 100644 (file)
--- a/tests/09imsm-assemble
+++ b/tests/09imsm-assemble
@@ -31,19 +31,19 @@ num_disks=4
 size=$((10*1024))
 mdadm -CR $container -e imsm -n $num_disks $dev0 $dev1 $dev2 $dev3
 mdadm -CR $member $dev0 $dev2 -n 2 -l 1 -z $size
-mdadm --wait $member
+mdadm --wait $member || true
 mdadm -Ss
 
 # make dev0 and dev1 a new rebuild family
 mdadm -A $container $dev0 $dev1
 mdadm -IR $container
-mdadm --wait ${member}_0
+mdadm --wait ${member}_0 || true
 mdadm -Ss
 
 # make dev2 and dev3 a new rebuild family
 mdadm -A $container $dev2 $dev3
 mdadm -IR $container
-mdadm --wait ${member}_0
+mdadm --wait ${member}_0 || true
 mdadm -Ss
 
 # reassemble and make sure one of the families falls out

diff --git a/tests/09imsm-create-fail-rebuild b/tests/09imsm-create-fail-rebuild
index 4b656b538e6a78f692693ecfc596a992aa2b4018..de17f321dbde9745cd733d41e2c1bc576d2e78d0 100644 (file)
--- a/tests/09imsm-create-fail-rebuild
+++ b/tests/09imsm-create-fail-rebuild
@@ -71,7 +71,7 @@ check wait
 # FAIL / REBUILD
 imsm_check_hold $container $dev0
 mdadm --fail $member0 $dev0
-mdadm --wait-clean --scan
+mdadm --wait-clean --scan || true
 imsm_check_removal $container $dev0
 mdadm --add $container $dev4
 check wait

diff --git a/tests/10ddf-assemble-missing b/tests/10ddf-assemble-missing
index 17f17244292e891898cc682f96d0f1edf2ddcaac..61ec8d591b0b642602c519ecda85e1d1717f62e7 100644 (file)
--- a/tests/10ddf-assemble-missing
+++ b/tests/10ddf-assemble-missing
@@ -12,8 +12,8 @@ ddf_check container 4
 mdadm -CR $member1 -n 4 -l 10 $dev8 $dev10 $dev9 $dev11 -z 10000
 mdadm -CR $member0 -n 2 -l 1 $dev8 $dev9 -z 10000
 
-mdadm --wait $member0
-mdadm --wait $member1
+mdadm --wait $member0 || true
+mdadm --wait $member1 || true
 
 mdadm -Ss
 sleep 1

diff --git a/tests/10ddf-create-fail-rebuild b/tests/10ddf-create-fail-rebuild
index 525c24d3636911b83616e3f217cb81bceb065af6..a8e8ced9ad52c3eaf6c22742ef86d74d63dff2c7 100644 (file)
--- a/tests/10ddf-create-fail-rebuild
+++ b/tests/10ddf-create-fail-rebuild
@@ -70,7 +70,7 @@ check wait
 # FAIL / REBUILD
 ddf_check_hold $container $dev8
 mdadm --fail $member0 $dev8
-mdadm --wait-clean --scan
+mdadm --wait-clean --scan || true
 ddf_check_removal $container $dev8
 mdadm --add $container $dev12
 check wait

diff --git a/tests/10ddf-fail-readd b/tests/10ddf-fail-readd
index 746f049e04429bc21b8bd94bd346e044ef41f6a3..411d35b2083e358bf78567c042fb7d34201a9ead 100644 (file)
--- a/tests/10ddf-fail-readd
+++ b/tests/10ddf-fail-readd
@@ -28,7 +28,7 @@ good0=$1
 mdadm $container --add $fail0
 
 sleep 1
-mdadm --wait $member0
+mdadm --wait $member0 || true
 
 ret=0
 set -- $(get_raiddisks $member0)

diff --git a/tests/10ddf-fail-readd-readonly b/tests/10ddf-fail-readd-readonly
index ed24585d2bd773190a4ae4867c064d52e0a31b1d..6a74d9c88b0165542de08c1c2d9955c178e9c402 100644 (file)
--- a/tests/10ddf-fail-readd-readonly
+++ b/tests/10ddf-fail-readd-readonly
@@ -45,7 +45,7 @@ mdadm $container --remove $fail0
 mdadm $container --add $fail0
 
 sleep 1
-mdadm --wait $member0
+mdadm --wait $member0 || true
 
 set -- $(get_raiddisks $member0)
 case $1:$2 in

diff --git a/tests/10ddf-fail-stop-readd b/tests/10ddf-fail-stop-readd
index 4a0511a1051a6001b264032972843e9b89aab6b7..b1bd81b40f3f8711458e8a6f00a8ce997929de39 100644 (file)
--- a/tests/10ddf-fail-stop-readd
+++ b/tests/10ddf-fail-stop-readd
@@ -39,7 +39,7 @@ mke2fs $member0
 mdadm $container --add $fail0
 
 sleep 1
-mdadm --wait $member0
+mdadm --wait $member0 || true
 
 ret=0
 set -- $(get_raiddisks $member0)

diff --git a/tests/10ddf-fail-twice b/tests/10ddf-fail-twice
index d0b4ac6171cf35b0f14a018bd803f1f710ea2856..6af194344e7c5b9eefbf1a61d8f30561b13c9106 100644 (file)
--- a/tests/10ddf-fail-twice
+++ b/tests/10ddf-fail-twice
@@ -7,7 +7,7 @@ ddf_check container $num_disks
 mdadm -CR $member0 -n 2 -l 1 $container
 mdadm -CR $member1 -n 3 -l 5 $container
 
-mdadm --wait $member1 $member0 || mdadm --wait $member1 $member0
+mdadm --wait $member1 $member0 || mdadm --wait $member1 $member0 || true
 
 set -- $(get_raiddisks $member0)
 fail0=$1
@@ -18,7 +18,7 @@ mdadm $member1 --fail $fail1
 
 mdadm $container --add $dev13
 
-mdadm --wait $member1 $member0 || mdadm --wait $member1 $member0
+mdadm --wait $member1 $member0 || mdadm --wait $member1 $member0 || true
 
 
 devs0="$(get_raiddisks $member0)"

diff --git a/tests/10ddf-fail-two-spares b/tests/10ddf-fail-two-spares
index fa6e2e8ceb5b4a0039be8547a8e2243fd00e22e9..c20eb4ae74a55b217e1ef6d72a971319420e897d 100644 (file)
--- a/tests/10ddf-fail-two-spares
+++ b/tests/10ddf-fail-two-spares
@@ -27,8 +27,8 @@ sleep 1
 mdadm --fail $member1 $dev12
 
 # We will have 4 resync procedures, 2 spares for 2 arrays.
-mdadm --wait $member1 $member0
-mdadm --wait $member1 $member0
+mdadm --wait $member1 $member0 || true
+mdadm --wait $member1 $member0 || true
 
 devs0="$(get_raiddisks $member0)"
 devs1="$(get_raiddisks $member1)"

diff --git a/tests/10ddf-incremental-wrong-order b/tests/10ddf-incremental-wrong-order
index 2324f1d773412883212610f052f10f05e9be8029..ca62b69807a05defdd1a1651b1e84670f8f31e83 100644 (file)
--- a/tests/10ddf-incremental-wrong-order
+++ b/tests/10ddf-incremental-wrong-order
@@ -14,8 +14,8 @@ ddf_check container 4
 mdadm -CR $member1 -n 4 -l 10 $dev8 $dev10 $dev9 $dev11 -z 10000
 mdadm -CR $member0 -n 2 -l 1 $dev8 $dev9 -z 10000
 
-mdadm --wait $member0
-mdadm --wait $member1
+mdadm --wait $member0 || true
+mdadm --wait $member1 || true
 
 mke2fs $member0
 mke2fs $member1

diff --git a/tests/10ddf-sudden-degraded b/tests/10ddf-sudden-degraded
index 1eab361a66f8e57652980712bd06a408ae528d2d..dc692aea900bc996858eb864b23ffb81aa8f975e 100644 (file)
--- a/tests/10ddf-sudden-degraded
+++ b/tests/10ddf-sudden-degraded
@@ -8,7 +8,7 @@ mdadm -CR $container -e ddf -n 2 $dev8 $dev9
 ddf_check container 2
 
 mdadm -CR $member1 -n 2 -l1 $dev8 $dev9
-mdadm --wait $member1
+mdadm --wait $member1 || true
 mdadm -Ss
 
 mdadm -I $dev8