From 7cd32c18a11d0dfeb70c276b0185e21d06a71fa5 Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Mon, 19 May 2014 13:29:06 +0530 Subject: tests: Use uniform timeouts Change-Id: I479ab941b3b2da3b16f624400fbd300f08326268 BUG: 1092850 Signed-off-by: Pranith Kumar K Reviewed-on: http://review.gluster.org/7799 Tested-by: Gluster Build System Reviewed-by: Anand Avati --- tests/bugs/bug-974972.t | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'tests/bugs/bug-974972.t') diff --git a/tests/bugs/bug-974972.t b/tests/bugs/bug-974972.t index 1b57307e76d..4d367a52cdf 100755 --- a/tests/bugs/bug-974972.t +++ b/tests/bugs/bug-974972.t @@ -12,22 +12,22 @@ TEST pidof glusterd TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{0,1} TEST $CLI volume set $V0 self-heal-daemon off TEST $CLI volume start $V0 -EXPECT_WITHIN 20 "1" is_nfs_export_available; +EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available; TEST mount_nfs $H0:/$V0 $N0 TEST touch $N0/1 TEST kill_brick ${V0} ${H0} ${B0}/${V0}1 echo abc > $N0/1 TEST $CLI volume start $V0 force -EXPECT_WITHIN 20 "Y" nfs_up_status -EXPECT_WITHIN 20 "1" afr_child_up_status_in_nfs $V0 0 -EXPECT_WITHIN 20 "1" afr_child_up_status_in_nfs $V0 1 +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Y" nfs_up_status +EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_nfs $V0 0 +EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_nfs $V0 1 TEST kill_brick ${V0} ${H0} ${B0}/${V0}0 echo def > $N0/1 TEST $CLI volume start $V0 force -EXPECT_WITHIN 20 "Y" nfs_up_status -EXPECT_WITHIN 20 "1" afr_child_up_status_in_nfs $V0 0 -EXPECT_WITHIN 20 "1" afr_child_up_status_in_nfs $V0 1 +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Y" nfs_up_status +EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_nfs $V0 0 +EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_nfs $V0 1 #Lookup should not fail TEST ls $N0/1 -- cgit