From 2ef9ad2dc5822b9b88243cb7f60816fe1c531e91 Mon Sep 17 00:00:00 2001
From: Jeff Darcy <jdarcy@redhat.com>
Date: Mon, 6 Apr 2015 20:44:09 -0400
Subject: tests: fix spurious regression in uss.t

Sometimes .snaps just doesn't seem to be available right after a
mount.  I have no idea, but maybe wrapping the next command in an
EXPECT_WITHIN will cut down on the spurious test failures.

Change-Id: I9bfda9d34e10ff0b783337e700ab8255dc6795ab
BUG: 1209286
Signed-off-by: Jeff Darcy <jdarcy@redhat.com>
Reviewed-on: http://review.gluster.org/10143
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
---
 tests/basic/uss.t | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/basic/uss.t b/tests/basic/uss.t
index 4465391245a..da195a949e2 100644
--- a/tests/basic/uss.t
+++ b/tests/basic/uss.t
@@ -23,6 +23,10 @@ function lookup()
     fi
 }
 
+count_snaps () {
+	ls $1/.snaps | wc -l
+}
+
 cleanup;
 TESTS_EXPECTED_IN_LOOP=10
 
@@ -75,7 +79,7 @@ EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0
 TEST $GFS --volfile-server=$H0 --volfile-id=$V0 $M0;
 
 # test 15
-TEST ls $M0/.snaps;
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "4" count_snaps $M0
 
 NUM_SNAPS=$(ls $M0/.snaps | wc -l);
 
-- 
cgit