From 3c899cab4d7ae1ed64689a40ea70153ead2bf4c5 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Thu, 7 May 2015 17:00:57 +1000
Subject: [PATCH] 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>
---
 tests/04update-metadata             | 2 +-
 tests/09imsm-assemble               | 6 +++---
 tests/09imsm-create-fail-rebuild    | 2 +-
 tests/10ddf-assemble-missing        | 4 ++--
 tests/10ddf-create-fail-rebuild     | 2 +-
 tests/10ddf-fail-readd              | 2 +-
 tests/10ddf-fail-readd-readonly     | 2 +-
 tests/10ddf-fail-stop-readd         | 2 +-
 tests/10ddf-fail-twice              | 4 ++--
 tests/10ddf-fail-two-spares         | 4 ++--
 tests/10ddf-incremental-wrong-order | 4 ++--
 tests/10ddf-sudden-degraded         | 2 +-
 12 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/tests/04update-metadata b/tests/04update-metadata
index 10bb70f..232fc1f 100644
--- 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 2a42369..d7028c6 100644
--- 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 4b656b5..de17f32 100644
--- 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 17f1724..61ec8d5 100644
--- 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 525c24d..a8e8ced 100644
--- 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 746f049..411d35b 100644
--- 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 ed24585..6a74d9c 100644
--- 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 4a0511a..b1bd81b 100644
--- 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 d0b4ac6..6af1943 100644
--- 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 fa6e2e8..c20eb4a 100644
--- 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 2324f1d..ca62b69 100644
--- 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 1eab361..dc692ae 100644
--- 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