summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2013-05-01 09:24:11 +1000
committerNeilBrown <neilb@suse.de>2013-05-01 09:24:11 +1000
commit79b2ed4f243b4ac59b4985f513b87dcde4fa6b8f (patch)
tree699881f495a4139d205777bcb6979df8f85ccfba /tests
parentbf3a33b35c8dec907a5e3f6941b79939b75d3294 (diff)
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>
Diffstat (limited to 'tests')
-rw-r--r--tests/05r1-bitmapfile1
-rw-r--r--tests/05r5-bitmapfile1
-rw-r--r--tests/05r5-internalbitmap1
-rw-r--r--tests/05r6-bitmapfile1
4 files changed, 4 insertions, 0 deletions
diff --git a/tests/05r1-bitmapfile b/tests/05r1-bitmapfile
index e1fc3de8..fcd8372b 100644
--- 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 c7537583..6d173d88 100644
--- 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 591c9dbf..13dc5921 100644
--- 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 28c590e4..d11896db 100644
--- 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