From 56ca0b14aaf4e6daddc2b787765db659b1c2ff1b Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Fri, 22 Jul 2016 13:58:22 +0530 Subject: tests: Fix pending-heal-count checks EXPECT_WITHIN takes regular expression to match the count, so even when there are say 10 entries to heal, it would think that the heal is complete. Fixed checking pending heal count with correct regex. Thanks to Xavi for finding this problem. >Change-Id: Ic593d22468b2b586bfca864962ffa0eda96b1d1f >BUG: 1332054 >Signed-off-by: Pranith Kumar K >Reviewed-on: http://review.gluster.org/14985 >Smoke: Gluster Build System >Reviewed-by: Xavier Hernandez >NetBSD-regression: NetBSD Build System >CentOS-regression: Gluster Build System BUG: 1360574 Change-Id: I310f8d492bb576224797d9090658ca1e6367861c Signed-off-by: Pranith Kumar K Reviewed-on: http://review.gluster.org/15023 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Ravishankar N --- tests/bugs/disperse/bug-1236065.t | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/bugs/disperse/bug-1236065.t b/tests/bugs/disperse/bug-1236065.t index 53dbcc57318..9038cb95948 100644 --- a/tests/bugs/disperse/bug-1236065.t +++ b/tests/bugs/disperse/bug-1236065.t @@ -53,7 +53,7 @@ EXPECT '7' online_brick_count # active heal 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 TEST rm -f *.o TEST ec_test_make @@ -75,7 +75,7 @@ EXPECT '7' online_brick_count # self-healing 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 TEST rm -f *.o TEST ec_test_make -- cgit