test/ddf: don't insist that mdadm.conf is always in the same order.

When created by different process, the order could reasonably
be different.  So sort before compare

Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
NeilBrown 2009-10-19 16:58:38 +11:00
parent 453e3b41d0
commit 00eb571675
1 changed files with 4 additions and 4 deletions

View File

@ -55,8 +55,8 @@ mdadm -Ss
mdadm -Asc /var/tmp/mdadm.conf
check nosync # This failed once. The raid5 was resyncing.
mdadm -Dbs > /tmp/mdadm.conf
diff /tmp/mdadm.conf /var/tmp/mdadm.conf
mdadm -Dbs | sort > /tmp/mdadm.conf
sort /var/tmp/mdadm.conf | diff /tmp/mdadm.conf -
mdadm -Ss
# and now assemble fully incrementally.
@ -70,7 +70,7 @@ do
done
check nosync
mdadm -Dbs > /tmp/mdadm.conf
diff /tmp/mdadm.conf /var/tmp/mdadm.conf
mdadm -Dbs | sort > /tmp/mdadm.conf
sort /var/tmp/mdadm.conf | diff /tmp/mdadm.conf -
mdadm -Ss
rm /tmp/mdadm.conf /var/tmp/mdadm.conf