Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id DE13F200B7E for ; Mon, 1 Aug 2016 23:05:53 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id DCA70160A66; Mon, 1 Aug 2016 21:05:53 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 24C1F160AAB for ; Mon, 1 Aug 2016 23:05:52 +0200 (CEST) Received: (qmail 50223 invoked by uid 500); 1 Aug 2016 21:05:52 -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 50144 invoked by uid 99); 1 Aug 2016 21:05:52 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Aug 2016 21:05:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EE5A9E1171; Mon, 1 Aug 2016 21:05:51 +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: Mon, 01 Aug 2016 21:05:55 -0000 Message-Id: <5acdf54db3c9457998aad3463d1314ee@git.apache.org> In-Reply-To: <949b2e5d9f3c414f8e58206813635609@git.apache.org> References: <949b2e5d9f3c414f8e58206813635609@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [05/10] accumulo git commit: Merge branch '1.6' into 1.7 archived-at: Mon, 01 Aug 2016 21:05:54 -0000 Merge branch '1.6' into 1.7 Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/268922b2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/268922b2 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/268922b2 Branch: refs/heads/1.8 Commit: 268922b21cb08e05f4d3268c4cbafeeefe75fee7 Parents: 5b80b2a d79776d Author: Josh Elser Authored: Mon Aug 1 16:43:35 2016 -0400 Committer: Josh Elser Committed: Mon Aug 1 16:43:35 2016 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/test/ShellServerIT.java | 24 ++++++-------------- 1 file changed, 7 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/268922b2/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java ---------------------------------------------------------------------- diff --cc test/src/test/java/org/apache/accumulo/test/ShellServerIT.java index ced4a6a,95066a5..b7bf85b --- a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java +++ b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java @@@ -717,8 -625,10 +707,8 @@@ public class ShellServerIT extends Shar ts.exec("getauths", true, "foo", true); ts.exec("getauths", true, "bar", true); passed = true; - } catch (Exception e) { - UtilWaitThread.sleep(500); - } catch (AssertionError e) { + } catch (AssertionError | Exception e) { - UtilWaitThread.sleep(300); + UtilWaitThread.sleep(500); } } assertTrue("Could not successfully see updated authoriations", passed);