tests: Fix get_pending_heal_count check in ec

Continuation of http://review.gluster.org/#/c/14985.
Also renamed tests/bugs/disperse to tests/bugs/ec for a better
correlation to tests/basic/ec and xlators/cluster/ec

Change-Id: I662b3477c12af8a0b94597769e8f00f354b1168c
BUG: 1332054
Signed-off-by: Ravishankar N <ravishankar@redhat.com>
Reviewed-on: http://review.gluster.org/15006
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Smoke: Gluster Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Reviewed-by: Xavier Hernandez <xhernandez@datalab.es>

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 e0fa3a1e3b..726e60d8fe 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 84361e440d..84361e440d 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 e8093e48a7..e8093e48a7 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 e7322210a3..e7322210a3 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 ea2d7b3983..ea2d7b3983 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 fb4b2082f8..fb4b2082f8 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 aa3a59bc62..aa3a59bc62 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 00fad825fa..00fad825fa 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 9038cb9594..9038cb9594 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 f805539b94..f89e71ace8 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 334e5c2593..334e5c2593 100755
--- a/tests/bugs/disperse/bug-1304988.t
+++ b/tests/bugs/ec/bug-1304988.t