From 45b1acf9a118cc503635660fa6107b2f85c9eaca Mon Sep 17 00:00:00 2001 From: Krutika Dhananjay Date: Fri, 16 Dec 2016 21:41:58 +0530 Subject: tests: Fix spurious failure in bug-1402841.t-mt-dir-scan-race.t Backport of: http://review.gluster.org/16169 Check that shd is up before executing 'volume heal' command Change-Id: I43634a979791fcb92bfebf93ec48eff42af2bb97 BUG: 1405890 Signed-off-by: Krutika Dhananjay Reviewed-on: http://review.gluster.org/16190 Reviewed-by: Ravishankar N Smoke: Gluster Build System CentOS-regression: Gluster Build System Reviewed-by: Raghavendra Talur NetBSD-regression: NetBSD Build System --- tests/bugs/core/bug-1402841.t-mt-dir-scan-race.t | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'tests') diff --git a/tests/bugs/core/bug-1402841.t-mt-dir-scan-race.t b/tests/bugs/core/bug-1402841.t-mt-dir-scan-race.t index e31c81005bf..6351ba22511 100755 --- a/tests/bugs/core/bug-1402841.t-mt-dir-scan-race.t +++ b/tests/bugs/core/bug-1402841.t-mt-dir-scan-race.t @@ -21,10 +21,20 @@ EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" afr_child_up_status $V0 1 EXPECT "200" get_pending_heal_count $V0 TEST $CLI volume set $V0 self-heal-daemon on + +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 1 + TEST $CLI volume heal $V0 TEST $CLI volume set $V0 self-heal-daemon off EXPECT_NOT "^0$" get_pending_heal_count $V0 TEST $CLI volume set $V0 self-heal-daemon on + +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 1 + TEST $CLI volume heal $V0 EXPECT_WITHIN $HEAL_TIMEOUT "^0$" get_pending_heal_count $V0 TEST umount $M0 -- cgit