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-830665.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-830665.t')
| -rwxr-xr-x | tests/bugs/bug-830665.t | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/bugs/bug-830665.t b/tests/bugs/bug-830665.t index e6804891e02..f5a5a67f8e9 100755 --- a/tests/bugs/bug-830665.t +++ b/tests/bugs/bug-830665.t @@ -43,7 +43,7 @@ TEST $CLI volume start $V0; EXPECT 'Started' volinfo_field $V0 'Status'; -EXPECT_WITHIN 20 "1" is_nfs_export_available; +EXPECT_WITHIN $NFS_EXPORT_TIMEOUT "1" is_nfs_export_available; ## Mount NFS TEST mount_nfs $H0:/$V0 $N0 nolock; @@ -69,7 +69,7 @@ setfattr -n trusted.glusterfs.volume-id -v $volid $B0/${V0}-0 ## Restart and remount. Note that we use actimeo=0 so that the stat calls ## we need for self-heal don't get blocked by the NFS client. 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,actimeo=0; ## The Linux NFS client has a really charming habit of caching stuff right @@ -89,8 +89,8 @@ TEST gluster volume heal $V0 full ## check, but we want to test whether self-heal already happened. ## Make sure everything's in order on the recreated brick. -EXPECT_WITHIN 20 'test_data' cat $B0/${V0}-0/a_file; -EXPECT_WITHIN 20 'more_test_data' cat $B0/${V0}-0/a_dir/another_file; +EXPECT_WITHIN $HEAL_TIMEOUT 'test_data' cat $B0/${V0}-0/a_file; +EXPECT_WITHIN $HEAL_TIMEOUT 'more_test_data' cat $B0/${V0}-0/a_dir/another_file; if [ "$EXIT_EARLY" = "1" ]; then exit 0; |