11 files changed, 4 insertions, 4 deletions
diff --git a/tests/basic/ec/ec-background-heals.t b/tests/basic/ec/ec-background-heals.t
index e0fa3a1e3b2..726e60d8fea 100644
--- a/tests/basic/ec/ec-background-heals.t
+++ b/tests/basic/ec/ec-background-heals.t
@@ -37,7 +37,7 @@ EXPECT_WITHIN $CONFIG_UPDATE_TIMEOUT "1" mount_get_option_value $M0 $V0-disperse
 EXPECT_WITHIN $CONFIG_UPDATE_TIMEOUT "128" mount_get_option_value $M0 $V0-disperse-0 heal-wait-qlength
 #Accessing file should heal the file now
 EXPECT "abc" cat $M0/a
-EXPECT_WITHIN $HEAL_TIMEOUT 0 get_pending_heal_count $V0
+EXPECT_WITHIN $HEAL_TIMEOUT "^0$" get_pending_heal_count $V0
 
 #Test above test cases with reset instead of setting background-heals to 1
 TEST $CLI volume set $V0 disperse.heal-wait-qlength 1024
@@ -63,7 +63,7 @@ EXPECT_WITHIN $CONFIG_UPDATE_TIMEOUT "8" mount_get_option_value $M0 $V0-disperse
 EXPECT_WITHIN $CONFIG_UPDATE_TIMEOUT "200" mount_get_option_value $M0 $V0-disperse-0 heal-wait-qlength
 #Accessing file should heal the file now
 EXPECT "abc" cat $M0/a
-EXPECT_WITHIN $HEAL_TIMEOUT 0 get_pending_heal_count $V0
+EXPECT_WITHIN $HEAL_TIMEOUT "^0$" get_pending_heal_count $V0
 
 #Test that disabling background-heals still drains the queue
 TEST $CLI volume set $V0 disperse.background-heals 1
@@ -81,7 +81,7 @@ TEST chown root:root $M0/{a,b,c,d}
 TEST $CLI volume set $V0 disperse.background-heals 0
 EXPECT_NOT "0" mount_get_option_value $M0 $V0-disperse-0 heal-waiters
 TEST truncate -s 0 $M0/a # This completes the heal fast ;-)
-EXPECT_WITHIN $HEAL_TIMEOUT 0 get_pending_heal_count $V0
+EXPECT_WITHIN $HEAL_TIMEOUT "^0$" get_pending_heal_count $V0
 
 #Test that background heals get rejected on meeting background-qlen limit
 TEST $CLI volume set $V0 disperse.background-heals 1
diff --git a/tests/bugs/disperse/bug-1161621.t b/tests/bugs/ec/bug-1161621.t
index 84361e440dc..84361e440dc 100644
--- a/tests/bugs/disperse/bug-1161621.t
+++ b/tests/bugs/ec/bug-1161621.t
diff --git a/tests/bugs/disperse/bug-1161886.c b/tests/bugs/ec/bug-1161886.c
index e8093e48a7a..e8093e48a7a 100644
--- a/tests/bugs/disperse/bug-1161886.c
+++ b/tests/bugs/ec/bug-1161886.c
diff --git a/tests/bugs/disperse/bug-1161886.t b/tests/bugs/ec/bug-1161886.t
index e7322210a3e..e7322210a3e 100644
--- a/tests/bugs/disperse/bug-1161886.t
+++ b/tests/bugs/ec/bug-1161886.t
diff --git a/tests/bugs/disperse/bug-1179050.t b/tests/bugs/ec/bug-1179050.t
index ea2d7b39838..ea2d7b39838 100644
--- a/tests/bugs/disperse/bug-1179050.t
+++ b/tests/bugs/ec/bug-1179050.t
diff --git a/tests/bugs/disperse/bug-1187474.t b/tests/bugs/ec/bug-1187474.t
index fb4b2082f8f..fb4b2082f8f 100644
--- a/tests/bugs/disperse/bug-1187474.t
+++ b/tests/bugs/ec/bug-1187474.t
diff --git a/tests/bugs/disperse/bug-1188145.t b/tests/bugs/ec/bug-1188145.t
index aa3a59bc62f..aa3a59bc62f 100644
--- a/tests/bugs/disperse/bug-1188145.t
+++ b/tests/bugs/ec/bug-1188145.t
diff --git a/tests/bugs/disperse/bug-1227869.t b/tests/bugs/ec/bug-1227869.t
index 00fad825fae..00fad825fae 100644
--- a/tests/bugs/disperse/bug-1227869.t
+++ b/tests/bugs/ec/bug-1227869.t
diff --git a/tests/bugs/disperse/bug-1236065.t b/tests/bugs/ec/bug-1236065.t
index 9038cb95948..9038cb95948 100644
--- a/tests/bugs/disperse/bug-1236065.t
+++ b/tests/bugs/ec/bug-1236065.t
diff --git a/tests/bugs/disperse/bug-1251446.t b/tests/bugs/ec/bug-1251446.t
index f805539b946..f89e71ace8b 100644
--- a/tests/bugs/disperse/bug-1251446.t
+++ b/tests/bugs/ec/bug-1251446.t
@@ -26,7 +26,7 @@ EXPECT '4' online_brick_count
 
 EXPECT_WITHIN $PROCESS_UP_TIMEOUT "[0-9][0-9]*" get_shd_process_pid
 TEST $CLI volume heal $V0 full
-EXPECT_WITHIN $HEAL_TIMEOUT "0" get_pending_heal_count $V0
+EXPECT_WITHIN $HEAL_TIMEOUT "^0$" get_pending_heal_count $V0
 
 EXPECT "699392" stat -c "%s" $B0/${V0}0/test2
 
diff --git a/tests/bugs/disperse/bug-1304988.t b/tests/bugs/ec/bug-1304988.t
index 334e5c25932..334e5c25932 100755
--- a/tests/bugs/disperse/bug-1304988.t
+++ b/tests/bugs/ec/bug-1304988.t