Exit when there are no more arrays to manage.

[thirdparty/mdadm.git] / tests / 03r5assemV1

diff --git a/tests/03r5assemV1 b/tests/03r5assemV1
index 7c72ad63543d13bdc2d68eb9d5f94f27aa1e06da..7553a4f0b9b56fab6854f57c8fbbe1ffcf6eab22 100644 (file)
--- a/tests/03r5assemV1
+++ b/tests/03r5assemV1
@@ -1,109 +1,115 @@
 
 # create a v-1 raid5 array and assemble in various ways
 
-mdadm -CR -e1 --name one $md1 -l5 -n3 $dev0 $dev1 $dev2 
+mdadm -CR -e1 --name one $md1 -l5 -n3 -x2 $dev0 $dev1 $dev2 $dev3 $dev4
 tst="check raid5 ;testdev $md1 2 $mdsize1 64 ; mdadm -S $md1"
 uuid=`mdadm -Db $md1 | sed 's/.*UUID=//'`
 check wait
 
 eval $tst
 
-mdadm -A $md1 $dev0 $dev1 $dev2 
+mdadm -A $md1 $dev0 $dev1 $dev2
+mdadm $md1 --add $dev3 $dev4
+check spares 2
 eval $tst
 
-mdadm -A $md1 -u $uuid $devlist 
+mdadm -A $md1 -u $uuid $devlist
+check spares 2
 eval $tst
 
-mdadm -A $md1 --name one $devlist  
+mdadm -A $md1 --name one $devlist
+check spares 2
 eval $tst
 
 
 conf=$targetdir/mdadm.conf
-{ 
+{
   echo DEVICE $devlist
   echo array $md1 UUID=$uuid
 } > $conf
 
-mdadm -As -c $conf $md1 
+mdadm -As -c $conf $md1
 eval $tst
 
-{ 
+{
   echo DEVICE $devlist
   echo array $md1 name=one
 } > $conf
 
-mdadm -As -c $conf  
+mdadm -As -c $conf
 eval $tst
 
-{ 
+{
   echo DEVICE $devlist
-  echo array $md1 devices=$dev0,$dev1,$dev2
+  echo array $md1 devices=$dev0,$dev1,$dev2,$dev3,$dev4
 } > $conf
 
-mdadm -As -c $conf 
+mdadm -As -c $conf
 
 echo "DEVICE $devlist" > $conf
 mdadm -Db $md1 >> $conf
 eval $tst
-
-mdadm --assemble --scan --config=$conf $md1 
+mdadm --assemble --scan --config=$conf $md1
 eval $tst
+echo PING >&2
 
-echo "  metadata=1.0 devices=$dev0,$dev1,$dev2" >> $conf
-mdadm --assemble --scan --config=$conf $md1 
+echo "  metadata=1.0 devices=$dev0,$dev1,$dev2,$dev3,$dev4" >> $conf
+mdadm --assemble --scan --config=$conf $md1
 eval $tst
 
 ### Now with a missing device
 
-mdadm -AR $md1 $dev0 $dev2 # 
+mdadm -AR $md1 $dev0 $dev2 $dev3 $dev4 #
 check state U_U
+check spares 1
 eval $tst
 
-mdadm -A $md1 -u $uuid $devlist 
+mdadm -A $md1 -u $uuid $devlist
 check state U_U
 eval $tst
 
-mdadm -A $md1 --name=one $devlist  
+mdadm -A $md1 --name=one $devlist
 check state U_U
+check spares 1
 eval $tst
 
 
 conf=$targetdir/mdadm.conf
-{ 
+{
   echo DEVICE $devlist
   echo array $md1 UUID=$uuid
 } > $conf
 
-mdadm -As -c $conf $md1 
+mdadm -As -c $conf $md1
 check state U_U
 eval $tst
 
-{ 
+{
   echo DEVICE $devlist
   echo array $md1 name=one
 } > $conf
 
-mdadm -As -c $conf  
+mdadm -As -c $conf
 check state U_U
 eval $tst
 
-{ 
+{
   echo DEVICE $devlist
   echo array $md1 devices=$dev0,$dev1,$dev2
 } > $conf
 
-mdadm -As -c $conf 
+mdadm -As -c $conf
 
 echo "DEVICE $devlist" > $conf
 mdadm -Db $md1 >> $conf
 check state U_U
 eval $tst
 
-mdadm --assemble --scan --config=$conf $md1 
+mdadm --assemble --scan --config=$conf $md1
 check state U_U
 eval $tst
 
 echo "  metadata=1.0 devices=$dev0,$dev1,$dev2" >> $conf
-mdadm --assemble --scan --config=$conf $md1 
+mdadm --assemble --scan --config=$conf $md1
 check state U_U
 eval $tst