diff options
| author | Pranith Kumar K <pkarampu@redhat.com> | 2014-05-19 13:29:06 +0530 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2014-05-19 21:00:46 -0700 |
| commit | 7cd32c18a11d0dfeb70c276b0185e21d06a71fa5 (patch) | |
| tree | 175980b522a99d89c09034c1f74489105f89619f /tests/bugs/bug-921072.t | |
| parent | c13c1fd5a487eeca269e8b62114f607487ee30f6 (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-921072.t')
| -rwxr-xr-x | tests/bugs/bug-921072.t | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/tests/bugs/bug-921072.t b/tests/bugs/bug-921072.t index 8ccdea90399..ea5a91c2c24 100755 --- a/tests/bugs/bug-921072.t +++ b/tests/bugs/bug-921072.t @@ -11,33 +11,33 @@ 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 umount $N0 # based on ip addresses (1-4) # case 1: allow only localhost ip TEST $CLI volume set $V0 nfs.rpc-auth-allow 127.0.0.1 -EXPECT_WITHIN 20 1 is_nfs_export_available +EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available TEST mount_nfs localhost:/$V0 $N0 nolock TEST umount $N0 # case 2: allow only non-localhost ip TEST $CLI volume set $V0 nfs.rpc-auth-allow 192.168.1.1 -EXPECT_WITHIN 20 1 is_nfs_export_available +EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available #11 TEST ! mount_nfs localhost:/$V0 $N0 nolock TEST $CLI volume reset --mode=script $V0 # case 3: reject only localhost ip TEST $CLI volume set $V0 nfs.rpc-auth-reject 127.0.0.1 -EXPECT_WITHIN 20 1 is_nfs_export_available +EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available TEST ! mount_nfs localhost:/$V0 $N0 nolock # case 4: reject only non-localhost ip TEST $CLI volume set $V0 nfs.rpc-auth-reject 192.168.1.1 -EXPECT_WITHIN 20 1 is_nfs_export_available +EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available TEST mount_nfs localhost:/$V0 $N0 nolock TEST umount $N0 @@ -48,21 +48,21 @@ TEST umount $N0 # CASES WITH NFS.ADDR-NAMELOOKUP ON (5-12) TEST $CLI volume reset --mode=script $V0 TEST $CLI volume set $V0 nfs.addr-namelookup on -EXPECT_WITHIN 20 1 is_nfs_export_available +EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available #20 TEST mount_nfs localhost:/$V0 $N0 nolock TEST umount $N0 # case 5: allow only localhost TEST $CLI volume set $V0 nfs.rpc-auth-allow localhost -EXPECT_WITHIN 20 1 is_nfs_export_available +EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available TEST mount_nfs localhost:/$V0 $N0 nolock TEST umount $N0 # case 6: allow only somehost TEST $CLI volume set $V0 nfs.rpc-auth-allow somehost -EXPECT_WITHIN 20 1 is_nfs_export_available +EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available TEST ! mount_nfs localhost:/$V0 $N0 nolock @@ -70,13 +70,13 @@ TEST ! mount_nfs localhost:/$V0 $N0 nolock TEST $CLI volume reset --mode=script $V0 TEST $CLI volume set $V0 nfs.addr-namelookup on TEST $CLI volume set $V0 nfs.rpc-auth-reject localhost -EXPECT_WITHIN 20 1 is_nfs_export_available +EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available #30 TEST ! mount_nfs localhost:/$V0 $N0 nolock # case 8: reject only somehost TEST $CLI volume set $V0 nfs.rpc-auth-reject somehost -EXPECT_WITHIN 20 1 is_nfs_export_available +EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available TEST mount_nfs localhost:/$V0 $N0 nolock TEST umount $N0 @@ -86,7 +86,7 @@ TEST umount $N0 TEST $CLI volume reset --mode=script $V0 TEST $CLI volume set $V0 nfs.addr-namelookup on TEST $CLI volume set $V0 nfs.rpc-auth-allow 127.0.0.1 -EXPECT_WITHIN 20 1 is_nfs_export_available +EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available TEST mount_nfs localhost:/$V0 $N0 nolock TEST mkdir -p $N0/subdir @@ -94,7 +94,7 @@ TEST umount $N0 # case 10: allow a non-localhost ip TEST $CLI volume set $V0 nfs.rpc-auth-allow 192.168.1.1 -EXPECT_WITHIN 20 1 is_nfs_export_available +EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available #41 TEST ! mount_nfs localhost:/$V0 $N0 nolock @@ -102,14 +102,14 @@ TEST ! mount_nfs localhost:/$V0 $N0 nolock TEST $CLI volume reset --mode=script $V0 TEST $CLI volume set $V0 nfs.addr-namelookup on TEST $CLI volume set $V0 nfs.rpc-auth-reject 127.0.0.1 -EXPECT_WITHIN 20 1 is_nfs_export_available +EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available TEST ! mount_nfs localhost:/$V0 $N0 nolock TEST ! mount_nfs localhost:/$V0/subdir $N0 nolock # case 12: reject only non-localhost ip TEST $CLI volume set $V0 nfs.rpc-auth-reject 192.168.1.1 -EXPECT_WITHIN 20 1 is_nfs_export_available +EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available TEST mount_nfs localhost:/$V0 $N0 nolock TEST umount $N0 |