ACCUMULO-2433 More test retries if at first we don't succeed.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dfbce9bc Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dfbce9bc Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dfbce9bc Branch: refs/heads/master Commit: dfbce9bcc361364c5a512406a1e4d9e2fd55ac56 Parents: 729e11a Author: Josh Elser <els...@apache.org> Authored: Thu Mar 27 15:58:39 2014 -0700 Committer: Josh Elser <els...@apache.org> Committed: Thu Mar 27 15:58:39 2014 -0700 ---------------------------------------------------------------------- .../org/apache/accumulo/test/ShellServerTest.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/dfbce9bc/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java b/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java index 624b3c2..533fdcf 100644 --- a/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java +++ b/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java @@ -18,6 +18,7 @@ package org.apache.accumulo.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -617,7 +618,18 @@ public class ShellServerTest { exec("addsplits row5 row7"); make10(); exec("flush -w -t " + table); - List<String> files = getFiles(tableId); + // Might have some cruft here. Check a couple of times. + List<String> files = null; + boolean found = false; + for (int i = 0; i < 50 && !found; i++) { + files = getFiles(tableId); + if (3 == files.size()) { + found = true; + } else { + UtilWaitThread.sleep(300); + } + } + assertNotNull(files); assertEquals("Found the following files: " + files, 3, files.size()); exec("deleterows -t " + table + " -b row5 -e row7", true); assertEquals(2, countFiles(tableId));
