tests: update tests to deal with invisible devices consistently

5 files changed, 27 insertions, 26 deletions

diff --git a/test/lib/aux.sh b/test/lib/aux.sh
index 216dd1950..51dba36b7 100644
--- a/test/lib/aux.sh
+++ b/test/lib/aux.sh
@@ -880,6 +880,7 @@ log/level = 9
 log/overwrite = 1
 log/syslog = 0
 log/verbose = 0
+report/mark_invisible_devices=0
 EOF
 	}
 
diff --git a/test/shell/pvmove-abort.sh b/test/shell/pvmove-abort.sh
index 336e92a95..1fbeb2022 100644
--- a/test/shell/pvmove-abort.sh
+++ b/test/shell/pvmove-abort.sh
@@ -51,8 +51,8 @@ pvmove --abort "$dev1"
 
 # check if proper pvmove was canceled
 get lv_field $vg name -a | tee out
-not grep "^\[pvmove0\]" out
-grep "^\[pvmove1\]" out
+not grep "^pvmove0" out
+grep "^pvmove1" out
 
 fi
 
diff --git a/test/shell/pvmove-resume-1.sh b/test/shell/pvmove-resume-1.sh
index f4ba5faf7..37f2d24c8 100644
--- a/test/shell/pvmove-resume-1.sh
+++ b/test/shell/pvmove-resume-1.sh
@@ -88,13 +88,13 @@ test_pvmove_resume() {
 	aux enable_dev "$dev4"
 
 	i=0
-	while get lv_field $vg name -a | grep "^\[pvmove"; do
+	while get lv_field $vg name -a | grep "^pvmove"; do
 		# wait for 30 secs at max
 		test $i -ge 300 && die "Pvmove is too slow or does not progress."
 		sleep .1
 		i=$((i + 1))
 	done
-	while get lv_field $vg1 name -a | grep "^\[pvmove"; do
+	while get lv_field $vg1 name -a | grep "^pvmove"; do
 		# wait for 30 secs at max
 		test $i -ge 300 && die "Pvmove is too slow or does not progress."
 		sleep .1
@@ -170,8 +170,8 @@ pvmove_fg() {
 	fi
 
 	# ...thus finish polling
-	get lv_field $vg name -a | grep "^\[pvmove0\]"
-	get lv_field $vg1 name -a | grep "^\[pvmove0\]"
+	get lv_field $vg name -a | grep "^pvmove0"
+	get lv_field $vg1 name -a | grep "^pvmove0"
 
 	# disable delay device
 	# fg pvmove would take ages to complete otherwise
@@ -195,8 +195,8 @@ pvmove_bg() {
 	fi
 
 	# ...thus finish polling
-	get lv_field $vg name -a | grep "^\[pvmove0\]"
-	get lv_field $vg1 name -a | grep "^\[pvmove0\]"
+	get lv_field $vg name -a | grep "^pvmove0"
+	get lv_field $vg1 name -a | grep "^pvmove0"
 
 	LVM_TEST_TAG="kill_me_$PREFIX" pvmove -b -i0
 }
@@ -215,8 +215,8 @@ pvmove_fg_single() {
 	fi
 
 	# ...thus finish polling
-	get lv_field $vg name -a | grep "^\[pvmove0\]"
-	get lv_field $vg1 name -a | grep "^\[pvmove0\]"
+	get lv_field $vg name -a | grep "^pvmove0"
+	get lv_field $vg1 name -a | grep "^pvmove0"
 
 	# disable delay device
 	# fg pvmove would take ages to complete otherwise
@@ -241,8 +241,8 @@ pvmove_bg_single() {
 	fi
 
 	# ...thus finish polling
-	get lv_field $vg name -a | grep "^\[pvmove0\]"
-	get lv_field $vg1 name -a | grep "^\[pvmove0\]"
+	get lv_field $vg name -a | grep "^pvmove0"
+	get lv_field $vg1 name -a | grep "^pvmove0"
 
 	LVM_TEST_TAG="kill_me_$PREFIX" pvmove -b "$dev1"
 	LVM_TEST_TAG="kill_me_$PREFIX" pvmove -b "$dev2"
diff --git a/test/shell/pvmove-resume-2.sh b/test/shell/pvmove-resume-2.sh
index c8643e43e..91453e402 100644
--- a/test/shell/pvmove-resume-2.sh
+++ b/test/shell/pvmove-resume-2.sh
@@ -75,7 +75,7 @@ test_pvmove_resume() {
 	aux enable_dev "$dev2"
 
 	i=0
-	while get lv_field $vg name -a | grep "^\[pvmove"; do
+	while get lv_field $vg name -a | grep "^pvmove"; do
 		# wait for 30 secs at max
 		test $i -ge 300 && die "Pvmove is too slow or does not progress."
 		sleep .1
@@ -128,7 +128,7 @@ pvmove_fg() {
 	fi
 
 	# ...thus finish polling
-	get lv_field $vg name -a | grep "^\[pvmove0\]"
+	get lv_field $vg name -a | grep "^pvmove0"
 
 	aux enable_dev "$dev2"
 
@@ -148,7 +148,7 @@ pvmove_bg() {
 	fi
 
 	# ...thus finish polling
-	get lv_field $vg name -a | grep "^\[pvmove0\]"
+	get lv_field $vg name -a | grep "^pvmove0"
 
 	LVM_TEST_TAG="kill_me_$PREFIX" pvmove -b
 }
@@ -166,7 +166,7 @@ pvmove_fg_single() {
 	fi
 
 	# ...thus finish polling
-	get lv_field $vg name -a | grep "^\[pvmove0\]"
+	get lv_field $vg name -a | grep "^pvmove0"
 
 	aux enable_dev "$dev2"
 
@@ -186,7 +186,7 @@ pvmove_bg_single() {
 	fi
 
 	# ...thus finish polling
-	get lv_field $vg name -a | grep "^\[pvmove0\]"
+	get lv_field $vg name -a | grep "^pvmove0"
 
 	LVM_TEST_TAG="kill_me_$PREFIX" pvmove -b "$dev1"
 }
diff --git a/test/shell/pvmove-resume-multiseg.sh b/test/shell/pvmove-resume-multiseg.sh
index 6982fef88..35ee8716f 100644
--- a/test/shell/pvmove-resume-multiseg.sh
+++ b/test/shell/pvmove-resume-multiseg.sh
@@ -88,7 +88,7 @@ test_pvmove_resume() {
 	aux enable_dev "$dev5"
 
 	i=0
-	while get lv_field $vg name -a | grep "^\[pvmove"; do
+	while get lv_field $vg name -a | grep "^pvmove"; do
 		# wait for 30 secs at max
 		test $i -ge 300 && die "Pvmove is too slow or does not progress."
 		sleep .1
@@ -144,8 +144,8 @@ pvmove_fg() {
 	fi
 
 	# ...thus finish polling
-	get lv_field $vg name -a | grep "^\[pvmove0\]"
-	get lv_field $vg name -a | grep "^\[pvmove1\]"
+	get lv_field $vg name -a | grep "^pvmove0"
+	get lv_field $vg name -a | grep "^pvmove1"
 
 	# disable delay device
 	# fg pvmove would take ages to complete otherwise
@@ -169,8 +169,8 @@ pvmove_bg() {
 	fi
 
 	# ...thus finish polling
-	get lv_field $vg name -a | grep "^\[pvmove0\]"
-	get lv_field $vg name -a | grep "^\[pvmove1\]"
+	get lv_field $vg name -a | grep "^pvmove0"
+	get lv_field $vg name -a | grep "^pvmove1"
 
 	LVM_TEST_TAG="kill_me_$PREFIX" pvmove -b
 }
@@ -189,8 +189,8 @@ pvmove_fg_single() {
 	fi
 
 	# ...thus finish polling
-	get lv_field $vg name -a | grep "^\[pvmove0\]"
-	get lv_field $vg name -a | grep "^\[pvmove1\]"
+	get lv_field $vg name -a | grep "^pvmove0"
+	get lv_field $vg name -a | grep "^pvmove1"
 
 	# disable delay device
 	# fg pvmove would take ages to complete otherwise
@@ -215,8 +215,8 @@ pvmove_bg_single() {
 	fi
 
 	# ...thus finish polling
-	get lv_field $vg name -a | grep "^\[pvmove0\]"
-	get lv_field $vg name -a | grep "^\[pvmove1\]"
+	get lv_field $vg name -a | grep "^pvmove0"
+	get lv_field $vg name -a | grep "^pvmove1"
 
 	LVM_TEST_TAG="kill_me_$PREFIX" pvmove -b "$dev1"
 	LVM_TEST_TAG="kill_me_$PREFIX" pvmove -b "$dev3"