tests: fix 07autoassemble

Block device check in testdev() is not sufficient as it does not account
for symlinks. Fix the check to use lsblk instead. Add mdstat check for
better debugging TC and change md0 for md127 as that will be array name
after assembly.

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

diff --git a/tests/07autoassemble b/tests/07autoassemble
index b6630e1719928fc9357b899bafbea24a3e2687fc..5372b9200335cc45a562bbc5cf29da42fd9bbcbb 100644 (file)
--- a/tests/07autoassemble
+++ b/tests/07autoassemble
@@ -45,6 +45,7 @@ mdadm -CR $md2 -l1 -n2 $dev2 $dev3
 mdadm -CR $md0 -l0 -n2 $md1 $md2
 mdadm -Ss
 mdadm -As -c /dev/null
+cat /proc/mdstat # For logs
 if [ $is_foreign == "yes" ]; then
        # md127 is md1
        testdev $md127 1 $mdsize1a 64
@@ -55,6 +56,6 @@ if [ $is_foreign == "yes" ]; then
 else
        testdev $md1 1 $mdsize1a 64
        testdev $md2 1 $mdsize1a 64
-       testdev $md0 2 $mdsize11a 512
+       testdev $md127 2 $mdsize11a 512
 fi
 mdadm -Ss

diff --git a/tests/func.sh b/tests/func.sh
index 46d77eec2dfae68da194d2a29998d8cf9f387787..61a35a866e148e1e531cabe6e488395811e4decb 100644 (file)
--- a/tests/func.sh
+++ b/tests/func.sh
@@ -445,7 +445,7 @@ no_errors() {
 
 # basic device test
 testdev() {
-       [ -b $1 ] || die "$1 isn't a block device."
+       lsblk -no name $1 || die "$1 isn't a block device."
        [ "$DEVTYPE" == "disk" ] && return 0
        udevadm settle
        dev=$1