summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorVijay Bellur <vbellur@redhat.com>2014-02-05 21:50:20 +0530
committerVijay Bellur <vbellur@redhat.com>2014-02-05 20:07:56 -0800
commitb187d3b5231406b524bf73b45f76e001692e282e (patch)
treefa030ca0300f282e07ad30946c96146ca3bb75ab /tests
parent2f8a8cfc27e6a73ff0238681ea40563c8768d4e6 (diff)
tests/basic: Prevent mount-options.t from being run.
mount-options.t introduces a race leading to failures in regression tests. Hence disabling the test unit till we sort out the race. Also removing the workaround introduced in mount.t. Change-Id: I7d60413bbff8597f90153cca838e326247e96cd9 BUG: 1060654 Signed-off-by: Vijay Bellur <vbellur@redhat.com> Reviewed-on: http://review.gluster.org/6911 Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/basic/mount-options.disabled (renamed from tests/basic/mount-options.t)0
-rwxr-xr-xtests/basic/mount.t4
2 files changed, 0 insertions, 4 deletions
diff --git a/tests/basic/mount-options.t b/tests/basic/mount-options.disabled
index 86d945ac5..86d945ac5 100644
--- a/tests/basic/mount-options.t
+++ b/tests/basic/mount-options.disabled
diff --git a/tests/basic/mount.t b/tests/basic/mount.t
index 4197a97da..8163975d6 100755
--- a/tests/basic/mount.t
+++ b/tests/basic/mount.t
@@ -52,10 +52,6 @@ TEST 'grep -E "^$H0:$V0 .+ ,?ro,.+" /proc/mounts';
## Wait for volume to register with rpc.mountd
EXPECT_WITHIN 20 "1" is_nfs_export_available;
-## HACK: mount seems to require about 40 seconds more to be successful,
-## sleep 40 is an interim fix till we root cause the underlying issue.
-sleep 40
-
## Mount NFS
TEST mount -t nfs -o nolock,soft,intr $H0:/$V0 $N0;