tests: Fix regression failures

Change-Id: I83dc651a5ce87adf51d1f539400cd91c801fc460
BUG: 1045309
Signed-off-by: Vijay Bellur <vbellur@redhat.com>
Reviewed-on: http://review.gluster.org/6874
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaushal M <kaushal@redhat.com>
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>

2 files changed, 7 insertions, 2 deletions

diff --git a/tests/basic/mount-options.t b/tests/basic/mount-options.t
index 1762823d744..86d945ac5b3 100644
--- a/tests/basic/mount-options.t
+++ b/tests/basic/mount-options.t
@@ -79,7 +79,7 @@ TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --volfile-check
 TEST umount -l $M0
 
 TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --dump-fuse=/tmp/a.txt
-EXPECT_NOT "0" wc -l /tmp/a.txt
+EXPECT "0" stat /tmp/a.txt
 TEST rm -f /tmp/a.txt
 TEST umount -l $M0
 
diff --git a/tests/basic/mount.t b/tests/basic/mount.t
index 90e522c5ea0..4197a97da8f 100755
--- a/tests/basic/mount.t
+++ b/tests/basic/mount.t
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 . $(dirname $0)/../include.rc
+. $(dirname $0)/../nfs.rc
 
 cleanup;
 
@@ -49,7 +50,11 @@ TEST 'mount -t fuse.glusterfs | grep -E "^$H0:$V0 .+ \(ro,"';
 TEST 'grep -E "^$H0:$V0 .+ ,?ro,.+" /proc/mounts';
 
 ## Wait for volume to register with rpc.mountd
-sleep 5;
+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;