summaryrefslogtreecommitdiffstats
path: root/tests/bugs/bug-904300.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/bugs/bug-904300.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/bugs/bug-904300.t')
-rwxr-xr-xtests/bugs/bug-904300.t10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/bugs/bug-904300.t b/tests/bugs/bug-904300.t
index 1e6917463ec..95be2724282 100755
--- a/tests/bugs/bug-904300.t
+++ b/tests/bugs/bug-904300.t
@@ -11,7 +11,7 @@ TEST pidof glusterd
TEST $CLI volume create $V0 $H0:$B0/$V0;
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 nolock
TEST mkdir $N0/dir1
@@ -21,7 +21,7 @@ TEST umount $N0
# Case 1: Allow "dir1" to be mounted only from 127.0.0.1
# 9-12
TEST $CLI volume set $V0 export-dir \""/dir1(127.0.0.1)"\"
-EXPECT_WITHIN 20 2 is_nfs_export_available
+EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 2 is_nfs_export_available
TEST mount_nfs localhost:/$V0/dir1 $N0 nolock
TEST umount $N0
@@ -31,7 +31,7 @@ TEST umount $N0
# a negative test case therefore the mount should fail.
# 13-16
TEST $CLI volume set $V0 export-dir \""/dir1(8.8.8.8)"\"
-EXPECT_WITHIN 20 2 is_nfs_export_available
+EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 2 is_nfs_export_available
TEST ! mount_nfs $H0:/$V0/dir1 $N0 nolock
TEST ! umount $N0
@@ -41,7 +41,7 @@ TEST ! umount $N0
# instead of ip address.
# 17-20
TEST $CLI volume set $V0 export-dir \""/dir1($H0)"\"
-EXPECT_WITHIN 20 2 is_nfs_export_available
+EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 2 is_nfs_export_available
TEST mount_nfs $H0:/$V0/dir1 $N0 nolock
TEST umount $N0
@@ -49,7 +49,7 @@ TEST umount $N0
# Case 4: Variation of test case1. Here we are checking with IP range
# 21-24
TEST $CLI volume set $V0 export-dir \""/dir1(127.0.0.0/24)"\"
-EXPECT_WITHIN 20 2 is_nfs_export_available
+EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 2 is_nfs_export_available
TEST mount_nfs localhost:/$V0/dir1 $N0 nolock
TEST umount $N0