Updated testing script

Since attrs were extended by 2 new fields update check functions.

diff --git a/test/lib/check.sh b/test/lib/check.sh
index 116ecdc14b3e4364ab7a14db31800b6aa03bf841..2837a226ea341f9cb499ff241283397509eb4ea8 100644 (file)
--- a/test/lib/check.sh
+++ b/test/lib/check.sh
@@ -139,8 +139,8 @@ mirror() {
 
 mirror_nonredundant() {
        lv="$1/$2"
-       lvs -oattr "$lv" | grep "^ *m.....$" >/dev/null || {
-               if lvs -oattr "$lv" | grep "^ *o.....$" >/dev/null &&
+       lvs -oattr "$lv" | grep "^ *m.......$" >/dev/null || {
+               if lvs -oattr "$lv" | grep "^ *o.......$" >/dev/null &&
                   lvs -a | fgrep "[${2}_mimage" >/dev/null; then
                        echo "TEST WARNING: $lv is a snapshot origin and looks like a mirror,"
                        echo "assuming it is actually a mirror"
@@ -183,7 +183,7 @@ linear() {
 
 active() {
        lv="$1/$2"
-       lvl -oattr "$lv" 2> /dev/null | grep "^ *....a.$" >/dev/null || {
+       lvl -oattr "$lv" 2> /dev/null | grep "^ *....a...$" >/dev/null || {
                echo "$lv expected active, but lvs says it's not:"
                lvl "$lv" -o+devices 2>/dev/null
                exit 1
@@ -197,7 +197,7 @@ active() {
 
 inactive() {
        lv="$1/$2"
-       lvl -oattr "$lv" 2> /dev/null | grep '^ *....[-isd].$' >/dev/null || {
+       lvl -oattr "$lv" 2> /dev/null | grep '^ *....[-isd]...$' >/dev/null || {
                echo "$lv expected inactive, but lvs says it's not:"
                lvl "$lv" -o+devices 2>/dev/null
                exit 1