From 7d63efc8d81abe954d520f727c910219c76c46f8 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Wed, 13 May 2015 13:11:02 +1000 Subject: [PATCH] tests: ignore failure status from mdadm -IRs This can report non-zero if there was nothing to do, and that isn't really an error. If the array doesn't get started, something else will complain. Signed-off-by: NeilBrown --- tests/10ddf-assemble-missing | 2 +- tests/10ddf-fail-stop-readd | 2 +- tests/10ddf-incremental-wrong-order | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/10ddf-assemble-missing b/tests/10ddf-assemble-missing index 61ec8d5..4bf21b2 100644 --- a/tests/10ddf-assemble-missing +++ b/tests/10ddf-assemble-missing @@ -23,7 +23,7 @@ mdadm -I $dev10 mdadm -I $dev11 # Start runnable members -mdadm -IRs +mdadm -IRs || true mdadm -Ss #[ -f /var/tmp/mdmon.log ] && cat /var/tmp/mdmon.log diff --git a/tests/10ddf-fail-stop-readd b/tests/10ddf-fail-stop-readd index b1bd81b..34aeaf5 100644 --- a/tests/10ddf-fail-stop-readd +++ b/tests/10ddf-fail-stop-readd @@ -30,7 +30,7 @@ mdadm -Ss sleep 1 # Now simulate incremental assembly mdadm -I $good0 -mdadm -IRs +mdadm -IRs || true # Write to the array mke2fs $member0 diff --git a/tests/10ddf-incremental-wrong-order b/tests/10ddf-incremental-wrong-order index ca62b69..d4e0d81 100644 --- a/tests/10ddf-incremental-wrong-order +++ b/tests/10ddf-incremental-wrong-order @@ -30,7 +30,7 @@ mdadm -I $dev10 mdadm -I $dev11 # Start runnable members ($member1) and write -mdadm -IRs +mdadm -IRs || true e2fsck -fy $member1 sha_1b=$(sha1_sum $member1) @@ -59,7 +59,7 @@ for d in $dev8 $dev9 $dev10 $dev11; do mdadm -I $d done -mdadm -IRs +mdadm -IRs || true sha_0c=$(sha1_sum $member0) sha_1c=$(sha1_sum $member1)