Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BD17617A32 for ; Sat, 1 Nov 2014 17:42:11 +0000 (UTC) Received: (qmail 62465 invoked by uid 500); 1 Nov 2014 17:42:11 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 62426 invoked by uid 500); 1 Nov 2014 17:42:11 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 62416 invoked by uid 99); 1 Nov 2014 17:42:11 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Nov 2014 17:42:11 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5D1CF993FCB; Sat, 1 Nov 2014 17:42:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Sat, 01 Nov 2014 17:42:11 -0000 Message-Id: <5e918be1dc9d4dcc96bd6dc252ffa99e@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: ACCUMULO-3290 Don't fail the test if we see a scan for the correct table that isn't yet running Repository: accumulo Updated Branches: refs/heads/1.6 9b20a9d40 -> e17d104c7 refs/heads/master cfbdef134 -> c746fe28a 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/1.6 Commit: e17d104c7ae0f2dd4625fba2506e6ad5f9450c87 Parents: 9b20a9d Author: Josh Elser Authored: Sat Nov 1 13:39:24 2014 -0400 Committer: Josh Elser 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();