summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPranith Kumar K <pkarampu@redhat.com>2014-05-22 05:53:02 +0530
committerPranith Kumar Karampuri <pkarampu@redhat.com>2014-05-21 19:53:46 -0700
commit0a77eb1e4576d8722b27a42c98879cc7250e00fe (patch)
treeb9eb56095566aa65d022663191cb791a07c2f684
parent99afc640f27841ec819c0f32c01f567fd0b345f8 (diff)
tests: s/timeout/EXPECT_WITHIN/
Also fixed nfs.rc so that regression build works on my fedora VM Change-Id: Ife36343bf1a590430e24065b9bcdf5bed3ae546d BUG: 1092850 Signed-off-by: Pranith Kumar K <pkarampu@redhat.com> Reviewed-on: http://review.gluster.org/7837 Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com>
-rwxr-xr-xtests/bugs/bug-948686.t2
-rw-r--r--tests/nfs.rc2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/bugs/bug-948686.t b/tests/bugs/bug-948686.t
index c9afc2f0758..040287024e8 100755
--- a/tests/bugs/bug-948686.t
+++ b/tests/bugs/bug-948686.t
@@ -28,7 +28,7 @@ TEST $CLI_1 volume set $V0 write-behind off
TEST touch $M0/{1..100};
TEST $CLI_1 volume stop $V0;
TEST $glusterd_3;
-sleep 3;
+EXPECT_WITHIN $PROBE_TIMEOUT 2 check_peers;
TEST $CLI_3 volume start $V0;
TEST $CLI_2 volume stop $V0;
TEST $CLI_2 volume delete $V0;
diff --git a/tests/nfs.rc b/tests/nfs.rc
index 6e4f5c0ab49..c27452395e1 100644
--- a/tests/nfs.rc
+++ b/tests/nfs.rc
@@ -13,7 +13,7 @@ function is_nfs_export_available ()
vol=$V0
fi
- exp=$(showmount -e 2> /dev/null | grep $vol | wc -l)
+ exp=$(showmount -e localhost 2> /dev/null | grep $vol | wc -l)
echo "$exp"
}