summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaghavendra Bhat <raghavendra@redhat.com>2015-05-26 15:10:25 +0530
committerVijay Bellur <vbellur@redhat.com>2015-05-27 05:35:34 -0700
commit0f55ed9bfdfb6856f5914f99d4e2e2a2dc97f73e (patch)
tree1871c8fff39eb46af44e53eb6177613c65b6e868
parentd6fc353afce03095c98d67d377eb7ddf334fd42e (diff)
tests/uss.t: wait for connection to complete before accessing a file in snapshot
Change-Id: I82d0cb378d006777d5a304afe8d5be15e92c7245 BUG: 1163543 Signed-off-by: Raghavendra Bhat <raghavendra@redhat.com> Reviewed-on: http://review.gluster.org/10915 Tested-by: Gluster Build System <jenkins@build.gluster.com> Tested-by: NetBSD Build System Reviewed-by: Vijay Bellur <vbellur@redhat.com>
-rwxr-xr-xrun-tests.sh3
-rw-r--r--tests/basic/uss.t2
2 files changed, 2 insertions, 3 deletions
diff --git a/run-tests.sh b/run-tests.sh
index 13108c19af9..9596fef96a7 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -194,8 +194,7 @@ function run_tests()
function is_bad_test ()
{
local name=$1
- for bt in ./tests/basic/uss.t \
- ./tests/bugs/replicate/bug-1015990.t \
+ for bt in ./tests/bugs/replicate/bug-1015990.t \
./tests/basic/ec/quota.t \
./tests/basic/quota-nfs.t \
./tests/bugs/quota/bug-1035576.t \
diff --git a/tests/basic/uss.t b/tests/basic/uss.t
index c41217ca025..60fcadffd2e 100644
--- a/tests/basic/uss.t
+++ b/tests/basic/uss.t
@@ -323,7 +323,7 @@ TEST ls $M0/.history;
EXPECT_WITHIN 30 "6" count_snaps $M0;
-TEST stat $M0/.history/snap6/aaa
+EXPECT_WITHIN 10 "Y" lookup $M0/.history/snap6/aaa
TEST rm -f $M0/aaa;