]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
imsm: FIX: existing backup file fails unit tests
authorAdam Kwolek <adam.kwolek@intel.com>
Mon, 14 Mar 2011 14:09:29 +0000 (15:09 +0100)
committerNeilBrown <neilb@suse.de>
Mon, 14 Mar 2011 21:46:54 +0000 (08:46 +1100)
During normal test execution, backup file is deleted after test execution.
If test is interrupted/broken, backup file can remain for next run.
When backup file exists before unit test run, suits 12 and 13 fails.

To avoid this remove backup file before grow is executed.

Signed-off-by: Adam Kwolek <adam.kwolek@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
tests/imsm-grow-template

index 7c212c481397da0f08a05dc907180ee140adae86..d03752d4802ffd6709bbe013e9b6d7100054144a 100644 (file)
@@ -17,8 +17,10 @@ function grow_member() {
        local offset=$6
        local chunk=$7
        local array_size=$((comps * size))
+       local backup_imsm=/tmp/backup_imsm
 
-       ( set -ex; mdadm --grow $member --chunk=$chunk --level=$level --backup-file=/tmp/backup_imsm )
+       rm -f $backup_imsm
+       ( set -ex; mdadm --grow $member --chunk=$chunk --level=$level --backup-file=$backup_imsm )
        local status=$?
        if [ $negative_test -ne 0 ]; then
                if [ $status -eq 0 ]; then
@@ -71,6 +73,7 @@ done
 
 imsm_check container $num_disks
 num_disks=$((num_disks + add_to_num_disks))
+backup_imsm=/tmp/backup_imsm
 
 # Grow each member or a container depending on the type of an operation
 if [ $migration_test -ne 0 ]; then
@@ -82,7 +85,8 @@ if [ $migration_test -ne 0 ]; then
                grow_member $member1 $new_num_disks $vol1_new_num_comps $vol1_new_level $vol1_comp_size $vol1_offset $vol1_new_chunk
        fi
 else
-       ( set -x; mdadm --grow $container --raid-disks=$num_disks --backup-file=/tmp/backup_imsm )
+       rm -f $backup_imsm
+       ( set -x; mdadm --grow $container --raid-disks=$num_disks --backup-file=$backup_imsm )
        grow_status=$?
        if [ $negative_test -ne 0 ]; then
                if [ $grow_status -eq 0 ]; then