tests: zero devices before --adding them.

Linux 3.10 will allow more "--add" to be handled as "--re-add".
To be sure the tests work correctly we sometimes need to zero
the device to ensure it really is an --add that happens.

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

diff --git a/tests/05r1-bitmapfile b/tests/05r1-bitmapfile
index e1fc3de83ed678a9ecf5baea57640b9553819c5e..fcd8372bae17cb4a66ab8861bf38ea0997665953 100644 (file)
--- a/tests/05r1-bitmapfile
+++ b/tests/05r1-bitmapfile
@@ -33,6 +33,7 @@ mdadm -S $md0
 
 mdadm --assemble -R $md0 --bitmap=$bmf $dev2
 dirty4=`mdadm -X $bmf | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'`
+mdadm --zero $dev1 # force --add, not --re-add
 mdadm $md0 --add $dev1
 #it is too fast# check recovery
 

diff --git a/tests/05r5-bitmapfile b/tests/05r5-bitmapfile
index c75375837801c586f6ceb714b2c2ebb09215def0..6d173d88d95f4cd676d8e75a00e7b7ff6bcbdc1f 100644 (file)
--- a/tests/05r5-bitmapfile
+++ b/tests/05r5-bitmapfile
@@ -32,6 +32,7 @@ fi
 mdadm -S $md0
 
 mdadm --assemble -R $md0 --bitmap=$bmf $dev2 $dev3
+mdadm --zero $dev1 # force add, not re-add
 mdadm $md0 --add $dev1
 check recovery
 

diff --git a/tests/05r5-internalbitmap b/tests/05r5-internalbitmap
index 591c9dbf1e7e4205fd8ccf3be8819ce627e137b3..13dc59215c1c7c91a5f6e6f9eb668abbe5f2ed4d 100644 (file)
--- a/tests/05r5-internalbitmap
+++ b/tests/05r5-internalbitmap
@@ -30,6 +30,7 @@ fi
 mdadm -S $md0
 
 mdadm --assemble -R $md0  $dev2 $dev3
+mdadm --zero $dev1 # force --add, not --re-add
 mdadm $md0 --add $dev1
 check recovery
 

diff --git a/tests/05r6-bitmapfile b/tests/05r6-bitmapfile
index 28c590e454d3843872bca99db5e72cbec0949120..d11896db221cde5672141a6485d07b74a3dbbd96 100644 (file)
--- a/tests/05r6-bitmapfile
+++ b/tests/05r6-bitmapfile
@@ -32,6 +32,7 @@ fi
 mdadm -S $md0
 
 mdadm --assemble -R $md0 --bitmap=$bmf $dev1 $dev2 $dev4
+mdadm --zero $dev3 # force --add, not --re-add
 mdadm $md0 --add $dev3
 check recovery