More fixes for tests.

Some more fixes to help some tests run properly.

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

diff --git a/tests/07changelevels b/tests/07changelevels
index 60f2f31868792e8b20cffb2106019befe24a7661..2d584e054b99d6858103e92d970d01d35d2c3d95 100644 (file)
--- a/tests/07changelevels
+++ b/tests/07changelevels
@@ -8,7 +8,7 @@ dd if=/dev/urandom of=/tmp/RandFile bs=1024 count=$testK
 export MDADM_GROW_VERIFY=1
 
 dotest() {
- sleep 0.5
+ sleep 2
  check wait
  testdev $md0 $1 19968 64 nd
  blockdev --flushbufs $md0

diff --git a/tests/10ddf-create b/tests/10ddf-create
index b48887c1a1b2c4790e7b36f506c689f5ce0e0244..ad3996e3d2453c8abce550173e485c8c702a68b5 100644 (file)
--- a/tests/10ddf-create
+++ b/tests/10ddf-create
@@ -59,7 +59,7 @@ mdadm -Ss
 # Now try to assemble using mdadm.conf
 mdadm -Asc /var/tmp/mdadm.conf
 check nosync  # This failed once. The raid5 was resyncing.
-
+udevadm settle
 mdadm -Dbs | sort > /tmp/mdadm.conf
 sort /var/tmp/mdadm.conf | diff /tmp/mdadm.conf -
 mdadm -Ss
@@ -74,7 +74,7 @@ do
   [ `cat /tmp/cnt` -eq 3 ]
 done
 check nosync
-
+udevadm settle
 mdadm -Dbs | sort > /tmp/mdadm.conf
 sort /var/tmp/mdadm.conf | diff /tmp/mdadm.conf -
 mdadm -Ss

diff --git a/tests/16imsm-r5_3d-migrate-r0_3d b/tests/16imsm-r5_3d-migrate-r0_3d
index 5a83c4197f96d5b136da0557ea8b3928b76187eb..b1459cc16fbba9d19879ee89faa734a66d84d2f2 100644 (file)
--- a/tests/16imsm-r5_3d-migrate-r0_3d
+++ b/tests/16imsm-r5_3d-migrate-r0_3d
@@ -1,6 +1,6 @@
 . tests/env-imsm-template
 
-# RAID 5 volume (3 disks) migrate to RAID 0 volume (3 disks)
+# RAID 5 volume (3 disks) migrate to RAID 0 volume (2 disks)
 # POSITIVE test
 
 num_disks=3
@@ -13,9 +13,9 @@ vol0_chunk=64
 vol0_num_comps=$((num_disks - 1))
 vol0_offset=0
 
-# After: RAID 5, 4 disks, 64k chunk size
+# After: RAID 0, 3 disks, 64k chunk size
 vol0_new_level=0
-vol0_new_num_comps=$num_disks
+vol0_new_num_comps=$((num_disks-1))
 vol0_new_chunk=64
 
 . tests/imsm-grow-template 0 1

diff --git a/tests/16imsm-r5_5d-migrate-r0_5d b/tests/16imsm-r5_5d-migrate-r0_5d
index ff5a2d82c2ea1927388d909c9d1c4c19d7107adc..323ca52e54bce4fe91dd149e31ebb0611cce5fca 100644 (file)
--- a/tests/16imsm-r5_5d-migrate-r0_5d
+++ b/tests/16imsm-r5_5d-migrate-r0_5d
@@ -1,6 +1,6 @@
 . tests/env-imsm-template
 
-# RAID 5 volume (5 disks) migration to RAID 0 volume (5 disks)
+# RAID 5 volume (5 disks) migration to RAID 0 volume (4 disks)
 # POSITIVE test
 
 num_disks=5
@@ -15,7 +15,7 @@ vol0_offset=0
 
 # After: RAID 0 volume, 5 disks, 64k chunk size
 vol0_new_level=0
-vol0_new_num_comps=$num_disks
+vol0_new_num_comps=$((num_disks - 1))
 vol0_new_chunk=64
 
 . tests/imsm-grow-template 0 1