diff options
| author | NeilBrown <neilb@suse.de> | 2011-06-16 14:18:18 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2011-06-16 14:18:18 +1000 |
| commit | 4ccc2562ac8dd836cdb881c88a080441c5abd172 (patch) | |
| tree | 316f6f6e86823019eb4ac93991c9e8e333132560 | |
| parent | af538d59c184b210cb6988fabeb1826939afe334 (diff) | |
| download | mdadm-4ccc2562ac8dd836cdb881c88a080441c5abd172.tar.gz | |
More fixes for tests.
Some more fixes to help some tests run properly.
Signed-off-by: NeilBrown <neilb@suse.de>
| -rw-r--r-- | tests/07changelevels | 2 | ||||
| -rw-r--r-- | tests/10ddf-create | 4 | ||||
| -rw-r--r-- | tests/16imsm-r5_3d-migrate-r0_3d | 6 | ||||
| -rw-r--r-- | tests/16imsm-r5_5d-migrate-r0_5d | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/tests/07changelevels b/tests/07changelevels index 60f2f31..2d584e0 100644 --- 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 b48887c..ad3996e 100644 --- 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 5a83c41..b1459cc 100644 --- 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 ff5a2d8..323ca52 100644 --- 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 |