accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [2/3] git commit: ACCUMULO-3290 Don't fail the test if we see a scan for the correct table that isn't yet running
Date Sat, 01 Nov 2014 17:42:12 GMT
ACCUMULO-3290 Don't fail the test if we see a scan for the correct table that isn't yet running

Subsequent invocations of listscans will catch the RUNNING variant
of a scan that is QUEUED.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e17d104c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e17d104c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e17d104c

Branch: refs/heads/master
Commit: e17d104c7ae0f2dd4625fba2506e6ad5f9450c87
Parents: 9b20a9d
Author: Josh Elser <elserj@apache.org>
Authored: Sat Nov 1 13:39:24 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Sat Nov 1 13:41:10 2014 -0400

----------------------------------------------------------------------
 test/src/test/java/org/apache/accumulo/test/ShellServerIT.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e17d104c/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
index 677e634..50e2d2b 100644
--- a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
@@ -1063,7 +1063,10 @@ public class ShellServerIT extends SimpleMacIT {
     assertFalse("Could not find any active scans over table " + table, scans.isEmpty());
 
     for (String scan : scans) {
-      assertTrue("Scan does not appear to be a 'RUNNING' scan: '" + scan + "'", scan.contains("RUNNING"));
+      if (!scan.contains("RUNNING")) {
+        log.info("Ignoring scan because it doesn't contain 'RUNNING': " + scan);
+        continue;
+      }
       String parts[] = scan.split("\\|");
       assertEquals("Expected 13 colums, but found " + parts.length + " instead for '" + Arrays.toString(parts)
+ "'", 13, parts.length);
       String tserver = parts[0].trim();


Mime
View raw message