summaryrefslogtreecommitdiffstats
path: root/tests/basic/self-heald.t
diff options
context:
space:
mode:
authorPranith Kumar K <pkarampu@redhat.com>2014-05-19 13:29:06 +0530
committerAnand Avati <avati@redhat.com>2014-05-19 21:00:46 -0700
commit7cd32c18a11d0dfeb70c276b0185e21d06a71fa5 (patch)
tree175980b522a99d89c09034c1f74489105f89619f /tests/basic/self-heald.t
parentc13c1fd5a487eeca269e8b62114f607487ee30f6 (diff)
tests: Use uniform timeouts
Change-Id: I479ab941b3b2da3b16f624400fbd300f08326268 BUG: 1092850 Signed-off-by: Pranith Kumar K <pkarampu@redhat.com> Reviewed-on: http://review.gluster.org/7799 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'tests/basic/self-heald.t')
-rw-r--r--tests/basic/self-heald.t14
1 files changed, 5 insertions, 9 deletions
diff --git a/tests/basic/self-heald.t b/tests/basic/self-heald.t
index 4468c881bac..913cfc80599 100644
--- a/tests/basic/self-heald.t
+++ b/tests/basic/self-heald.t
@@ -34,15 +34,11 @@ TEST ! $CLI volume heal $V0 info
TEST ! $CLI volume heal $V0
TEST $CLI volume start $V0 force
TEST $CLI volume set $V0 cluster.self-heal-daemon on
-EXPECT_WITHIN 20 "Y" glustershd_up_status
-EXPECT_WITHIN 20 "1" afr_child_up_status_in_shd $V0 0
-EXPECT_WITHIN 20 "1" afr_child_up_status_in_shd $V0 2
-EXPECT_WITHIN 20 "1" afr_child_up_status_in_shd $V0 4
-TEST $CLI volume heal $V0
-sleep 5 #Until the heal-statistics command implementation
-#check that this heals the contents partially
-TEST [ $HEAL_FILES -gt $(afr_get_pending_heal_count $V0) ]
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Y" glustershd_up_status
+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 0
+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 2
+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 4
TEST $CLI volume heal $V0 full
-EXPECT_WITHIN 30 "0" afr_get_pending_heal_count $V0
+EXPECT_WITHIN $HEAL_TIMEOUT "0" afr_get_pending_heal_count $V0
cleanup