summaryrefslogtreecommitdiffstats
path: root/tests/basic
diff options
context:
space:
mode:
authorJeff Darcy <jdarcy@redhat.com>2015-04-06 20:44:09 -0400
committerVijay Bellur <vbellur@redhat.com>2015-04-06 22:37:37 -0700
commit2ef9ad2dc5822b9b88243cb7f60816fe1c531e91 (patch)
tree71b978335055c67a107450e19d57ce27ddc0db7e /tests/basic
parent6e7d9a4e77a764e86bcde4e704ec05a3c84f9c11 (diff)
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>
Diffstat (limited to 'tests/basic')
-rw-r--r--tests/basic/uss.t6
1 files changed, 5 insertions, 1 deletions
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);