From 424189775e847b5dda223434f7ec4e0a98938822 Mon Sep 17 00:00:00 2001 From: Avra Sengupta Date: Mon, 4 May 2015 14:19:36 +0530 Subject: snapshot/uss: fix regression failure in bug-1162498.t .snaps seems to take some time, before it is available based on the state of the system. Using EXPECT_WITHIN instead of TEST to check the contents of .snaps, hence giving it some time to come up. Change-Id: Iac166500d5a09ba8bab00d994c27a9ad0a01b9c3 BUG: 1218576 Signed-off-by: Avra Sengupta Reviewed-on: http://review.gluster.org/10518 Tested-by: Gluster Build System Reviewed-by: Rajesh Joseph Reviewed-by: Pranith Kumar Karampuri Reviewed-on: http://review.gluster.org/10561 --- tests/basic/uss.t | 4 ---- tests/bugs/snapshot/bug-1162498.t | 5 ++--- tests/snapshot.rc | 4 ++++ 3 files changed, 6 insertions(+), 7 deletions(-) mode change 100644 => 100755 tests/bugs/snapshot/bug-1162498.t diff --git a/tests/basic/uss.t b/tests/basic/uss.t index da195a949e2..c41217ca025 100644 --- a/tests/basic/uss.t +++ b/tests/basic/uss.t @@ -23,10 +23,6 @@ function lookup() fi } -count_snaps () { - ls $1/.snaps | wc -l -} - cleanup; TESTS_EXPECTED_IN_LOOP=10 diff --git a/tests/bugs/snapshot/bug-1162498.t b/tests/bugs/snapshot/bug-1162498.t old mode 100644 new mode 100755 index 665d60fd0bf..afc065000d5 --- a/tests/bugs/snapshot/bug-1162498.t +++ b/tests/bugs/snapshot/bug-1162498.t @@ -41,9 +41,9 @@ TEST glusterfs -s $H0 --volfile-id=$V0 $M0 #Dir xyz exists in snap1 EXPECT_WITHIN $PROCESS_UP_TIMEOUT "0" STAT $M0/xyz -TEST ls $M0/xyz/.snaps/ +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "3" count_snaps $M0/xyz TEST mkdir $M0/abc -TEST ls $M0/abc/.snaps/ +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "3" count_snaps $M0/abc #Clean up TEST $CLI snapshot delete snap1 @@ -53,4 +53,3 @@ TEST $CLI volume stop $V0 force TEST $CLI volume delete $V0 cleanup; - diff --git a/tests/snapshot.rc b/tests/snapshot.rc index d5332377ede..7fe9b39cd7c 100644 --- a/tests/snapshot.rc +++ b/tests/snapshot.rc @@ -16,6 +16,10 @@ function init_n_bricks() { done } +count_snaps () { + ls $1/.snaps | wc -l +} + function init_lvm() { if [ "$1" == "" ]; then echo "Error: Invalid argument supplied" -- cgit