tests: increase sleeps for 04r5swap and 05r tests

This commit increases sleep times from 4 seconds to 6 as some of the
tests seem to be randomly failing due to this.

Signed-off-by: Mateusz Kusiak <mateusz.kusiak@intel.com>

diff --git a/tests/04r5swap b/tests/04r5swap
index 5373a60725fb3dcd32598f03c72d5eb58a794b81..e5f76ea86d90e789eedc477eb11e9ff0219cf802 100644 (file)
--- a/tests/04r5swap
+++ b/tests/04r5swap
@@ -2,7 +2,7 @@
 # make a raid5 array, byte swap the superblocks, then assemble...
 
 mdadm -CR $md0 -e 0.90 -l5 -n4 $dev0 $dev1 $dev2 $dev3
-sleep 4
+sleep 6
 mdadm -S $md0
 
 mdadm -E --metadata=0 $dev1  > $targetdir/d1

diff --git a/tests/05r1-grow-internal b/tests/05r1-grow-internal
index f7fff989a9ce3f5306d3c51ef8034c91adef42b6..6e2dac2a2b35001681328d430d030fa4318619ef 100644 (file)
--- a/tests/05r1-grow-internal
+++ b/tests/05r1-grow-internal
@@ -8,11 +8,11 @@ testdev $md0 1 $mdsize1a 64
 
 #mdadm -E $dev1
 mdadm --grow $md0 --bitmap=internal --bitmap-chunk=4 --delay=1 || { mdadm -X $dev2 ; exit 1; }
-sleep 4
+sleep 6
 dirty1=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'`
 
 testdev $md0 1 $mdsize1a 64
-sleep 4
+sleep 6
 dirty2=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'`
 
 if [ $dirty1 -ne 0 -o $dirty2 -ne 0 ]

diff --git a/tests/05r1-grow-internal-1 b/tests/05r1-grow-internal-1
index f0f8349f8ccff96d0624f03cbe7b319015918c7d..c88533f9524aedc9f7b58ec9b7da58e9bd6787dc 100644 (file)
--- a/tests/05r1-grow-internal-1
+++ b/tests/05r1-grow-internal-1
@@ -8,11 +8,11 @@ testdev $md0 1 $mdsize1b 64
 
 #mdadm -E $dev1
 mdadm --grow $md0 --bitmap=internal --bitmap-chunk=4 --delay=1
-sleep 4
+sleep 6
 dirty1=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'`
 
 testdev $md0 1 $mdsize1b 64
-sleep 4
+sleep 6
 dirty2=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'`
 
 if [ $dirty1 -ne 0 -o $dirty2 -ne 0 ]

diff --git a/tests/05r1-internalbitmap b/tests/05r1-internalbitmap
index f1a2843efa104688dd1461df9de94719f9485970..401c5d2fd83ff7c113f6827a24efe072593f347b 100644 (file)
--- a/tests/05r1-internalbitmap
+++ b/tests/05r1-internalbitmap
@@ -9,7 +9,7 @@ mdadm -S $md0
 
 mdadm --assemble $md0 $dev1 $dev2
 testdev $md0 1 $mdsize0 64
-sleep 4
+sleep 6
 dirty1=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'`
 
 if [ $dirty1 -ne 0 ]
@@ -18,7 +18,7 @@ then  echo >&2 "ERROR bad 'dirty' counts: $dirty1"
 fi
 mdadm $md0 -f $dev1
 testdev $md0 1 $mdsize0 64
-sleep 4
+sleep 6
 total=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) bits.*/\1/p'`
 dirty2=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'`
 if [ $dirty2 -ne $total ]
@@ -34,7 +34,7 @@ mdadm $md0 --add $dev1
 check recovery
 
 check wait
-sleep 4
+sleep 6
 dirty3=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'`
 
 if [ $dirty3 -ne 0 ]

diff --git a/tests/05r1-internalbitmap-v1a b/tests/05r1-internalbitmap-v1a
index cf3f39722d83e10ccedcd8d5faf01fbef9d86115..0b738b58ef867ea6a462fe7f3c74311d9142574c 100644 (file)
--- a/tests/05r1-internalbitmap-v1a
+++ b/tests/05r1-internalbitmap-v1a
@@ -10,7 +10,7 @@ mdadm -S $md0
 
 mdadm --assemble $md0 $dev1 $dev2
 testdev $md0 1 $mdsize1b 64
-sleep 4
+sleep 6
 dirty1=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'`
 
 if [ $dirty1 -ne 0 ]
@@ -19,7 +19,7 @@ then  echo >&2 "ERROR bad 'dirty' counts: $dirty1"
 fi
 mdadm $md0 -f $dev1
 testdev $md0 1 $mdsize1b 64
-sleep 4
+sleep 6
 total=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) bits.*/\1/p'`
 dirty2=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'`
 if [ $dirty2 -ne $total ]
@@ -35,7 +35,7 @@ mdadm $md0 --add $dev1
 check recovery
 
 check wait
-sleep 4
+sleep 6
 dirty3=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'`
 
 if [ $dirty3 -ne 0 ]

diff --git a/tests/05r1-internalbitmap-v1b b/tests/05r1-internalbitmap-v1b
index 4952887e8ab9e949911d3cd4a04c156224b1d608..8999a50ed0b61efb673cc45f7716bd504390c8eb 100644 (file)
--- a/tests/05r1-internalbitmap-v1b
+++ b/tests/05r1-internalbitmap-v1b
@@ -11,7 +11,7 @@ mdadm -S $md0
 mdadm --assemble $md0 $dev1 $dev2
 check bitmap
 testdev $md0 1 $mdsize11 64
-sleep 4
+sleep 6
 dirty1=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'`
 
 if [ $dirty1 -ne 0 ]
@@ -20,7 +20,7 @@ then  echo >&2 "ERROR bad 'dirty' counts: $dirty1"
 fi
 mdadm $md0 -f $dev1
 testdev $md0 1 $mdsize11 64
-sleep 4
+sleep 6
 total=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) bits.*/\1/p'`
 dirty2=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'`
 if [ $dirty2 -ne $total ]
@@ -35,7 +35,7 @@ mdadm --assemble -R $md0  $dev2
 mdadm $md0 --add $dev1
 check recovery
 check wait
-sleep 4
+sleep 6
 dirty3=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'`
 
 if [ $dirty3 -ne 0 ]

diff --git a/tests/05r1-internalbitmap-v1c b/tests/05r1-internalbitmap-v1c
index e1e4472f0929f60b59c8a5946ea7ffa59506eb8b..75203b4d9cff8fa298c3b903366ddc84dd8ea1ba 100644 (file)
--- a/tests/05r1-internalbitmap-v1c
+++ b/tests/05r1-internalbitmap-v1c
@@ -10,7 +10,7 @@ mdadm -S $md0
 
 mdadm --assemble $md0 $dev1 $dev2
 testdev $md0 1 $mdsize12 64
-sleep 4
+sleep 6
 dirty1=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'`
 
 if [ $dirty1 -ne 0 ]
@@ -19,7 +19,7 @@ then  echo >&2 "ERROR bad 'dirty' counts: $dirty1"
 fi
 mdadm $md0 -f $dev1
 testdev $md0 1 $mdsize12 64
-sleep 4
+sleep 6
 total=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) bits.*/\1/p'`
 dirty2=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'`
 if [ $dirty2 -ne $total ]
@@ -35,7 +35,7 @@ mdadm $md0 --add $dev1
 check recovery
 
 check wait
-sleep 4
+sleep 6
 dirty3=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'`
 
 if [ $dirty3 -ne 0 ]

diff --git a/tests/05r1-re-add b/tests/05r1-re-add
index fa6bbcb421e5421f211241f7f36a75d82a0762bd..4fc263f5a7b78fb81e308e68b93922aa0d2c852a 100644 (file)
--- a/tests/05r1-re-add
+++ b/tests/05r1-re-add
@@ -9,7 +9,7 @@ mdadm -CR $md0 -l1 -n2 -binternal --bitmap-chunk=4 -d1 $dev1 $dev2
 check resync
 check wait
 testdev $md0 1 $mdsize1a 64
-sleep 4
+sleep 6
 
 mdadm $md0 -f $dev2
 sleep 1

diff --git a/tests/05r1-re-add-nosuper b/tests/05r1-re-add-nosuper
index a6ac6ed5e0033449384ffac764e52ff2558f55ab..f243e4aafca3086e18d207974ce9cf1c63805470 100644 (file)
--- a/tests/05r1-re-add-nosuper
+++ b/tests/05r1-re-add-nosuper
@@ -7,7 +7,7 @@ sleep 1
 check resync
 check wait
 testdev $md0 1 $size 1
-sleep 4
+sleep 6
 
 mdadm $md0 -f $dev2
 sleep 1

diff --git a/tests/05r5-internalbitmap b/tests/05r5-internalbitmap
index 1a64482f11dd8b76f6b63df372d707076cca1495..4264aa618ceebecec44424ab45bfc2579391b306 100644 (file)
--- a/tests/05r5-internalbitmap
+++ b/tests/05r5-internalbitmap
@@ -9,7 +9,7 @@ mdadm -S $md0
 
 mdadm --assemble $md0 $dev1 $dev2 $dev3
 testdev $md0 2 $mdsize1 512
-sleep 4
+sleep 6
 dirty1=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'`
 
 if [ $dirty1 -ne 0 ]
@@ -18,7 +18,7 @@ then  echo >&2 "ERROR bad 'dirty' counts: $dirty1"
 fi
 mdadm $md0 -f $dev1
 testdev $md0 2 $mdsize1 512
-sleep 4
+sleep 6
 dirty2=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'`
 if [ $dirty2 -lt 400 ]
 then
@@ -33,7 +33,7 @@ mdadm --zero $dev1 # force --add, not --re-add
 mdadm $md0 --add $dev1
 check recovery
 check wait
-sleep 4
+sleep 6
 dirty3=`mdadm -X $dev2 | sed -n -e 's/.*Bitmap.* \([0-9]*\) dirty.*/\1/p'`
 
 if [ $dirty3 -ne 0 ]