summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Darcy <jdarcy@redhat.com>2016-02-29 15:27:31 +0530
committerJeff Darcy <jdarcy@redhat.com>2016-02-29 17:35:45 -0800
commit99fde63452d33c3b80997883c91b2ea0f422db5b (patch)
tree5f5bc581db2b0479a1560391d5710804dd44f4c5
parenta60c39de31e8258cb56d8db6bd8ec2491a942a4e (diff)
tests: fix bug-860663.t
Three changes: * Removed the second round of file creation, which wasn't really testing anything useful and was causing spurious failures. Under the conditions we've set up, the rational expectation would be for the file-creation helper program to succeed, but the test expected it to fail. * Removed Yet Another Unnecessary Sleep. * Reduced the number of files from 10K to 1K. That's more than sufficient to test what we're trying to test, and saves significant time. Change-Id: If1c623853745ab42ce7d058d1009bbe1dcc1e985 Signed-off-by: Jeff Darcy <jdarcy@redhat.com> Reviewed-on: http://review.gluster.org/13544 Reviewed-by: Joseph Fernandes Smoke: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: N Balachandran <nbalacha@redhat.com> CentOS-regression: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
-rw-r--r--tests/bugs/distribute/bug-860663.t11
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/bugs/distribute/bug-860663.t b/tests/bugs/distribute/bug-860663.t
index ebae0e5d824..a4946718398 100644
--- a/tests/bugs/distribute/bug-860663.t
+++ b/tests/bugs/distribute/bug-860663.t
@@ -29,10 +29,10 @@ TEST $CLI volume start $V0
## Mount FUSE
TEST glusterfs -s $H0 --volfile-id $V0 $M0;
-TEST $(dirname $0)/bug-860663 $M0/files 10000
+TEST $(dirname $0)/bug-860663 $M0/files 1000
ORIG_FILE_COUNT=`ls -l $M0 | wc -l`;
-TEST [ $ORIG_FILE_COUNT -ge 10000 ]
+TEST [ $ORIG_FILE_COUNT -ge 1000 ]
# Kill a brick process
kill -9 `cat $GLUSTERD_WORKDIR/vols/$V0/run/$H0-d-backends-${V0}1.pid`;
@@ -46,10 +46,9 @@ TEST $CLI volume rebalance $V0 fix-layout start
EXPECT_WITHIN $REBALANCE_TIMEOUT "fix-layout completed" rebalance_status_field $V0;
-TEST ! $(dirname $0)/bug-860663 $M0/files 10000
-
-
-sleep 5;
+# Unmount and remount to make sure we're doing fresh lookups.
+TEST umount $M0
+TEST glusterfs -s $H0 --volfile-id $V0 $M0;
NEW_FILE_COUNT=`ls -l $M0 | wc -l`;