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 B9AC9200BAD for ; Wed, 26 Oct 2016 00:02:04 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B82D3160AFA; Tue, 25 Oct 2016 22:02:04 +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 0BFC5160AD8 for ; Wed, 26 Oct 2016 00:02:03 +0200 (CEST) Received: (qmail 5891 invoked by uid 500); 25 Oct 2016 22:02:03 -0000 Mailing-List: contact commits-help@fluo.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@fluo.incubator.apache.org Delivered-To: mailing list commits@fluo.incubator.apache.org Received: (qmail 5882 invoked by uid 99); 25 Oct 2016 22:02:03 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Oct 2016 22:02:03 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id A25CF180B0F for ; Tue, 25 Oct 2016 22:02:02 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.219 X-Spam-Level: X-Spam-Status: No, score=-6.219 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id UErdEXkiZ4MQ for ; Tue, 25 Oct 2016 22:02:01 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 67E4E5FD01 for ; Tue, 25 Oct 2016 22:02:01 +0000 (UTC) Received: (qmail 19262 invoked by uid 99); 25 Oct 2016 21:35:21 -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; Tue, 25 Oct 2016 21:35:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7EE28DFDC4; Tue, 25 Oct 2016 21:35:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kturner@apache.org To: commits@fluo.incubator.apache.org Date: Tue, 25 Oct 2016 21:35:21 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-fluo git commit: fixes #791 give Oracle more time to stop in IT archived-at: Tue, 25 Oct 2016 22:02:04 -0000 Repository: incubator-fluo Updated Branches: refs/heads/master 1d243c312 -> d99a6e0fa fixes #791 give Oracle more time to stop in IT Project: http://git-wip-us.apache.org/repos/asf/incubator-fluo/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-fluo/commit/34d8944c Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo/tree/34d8944c Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo/diff/34d8944c Branch: refs/heads/master Commit: 34d8944c1ad4f93aa86ba74276e0f851c5a404d5 Parents: 2f9d3ee Author: Keith Turner Authored: Mon Oct 24 17:44:31 2016 -0400 Committer: Keith Turner Committed: Tue Oct 25 17:33:49 2016 -0400 ---------------------------------------------------------------------- .../java/org/apache/fluo/integration/impl/OracleIT.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-fluo/blob/34d8944c/modules/integration/src/test/java/org/apache/fluo/integration/impl/OracleIT.java ---------------------------------------------------------------------- diff --git a/modules/integration/src/test/java/org/apache/fluo/integration/impl/OracleIT.java b/modules/integration/src/test/java/org/apache/fluo/integration/impl/OracleIT.java index 91636f7..e543c3c 100644 --- a/modules/integration/src/test/java/org/apache/fluo/integration/impl/OracleIT.java +++ b/modules/integration/src/test/java/org/apache/fluo/integration/impl/OracleIT.java @@ -36,7 +36,9 @@ import org.apache.fluo.integration.ITBaseImpl; import org.apache.log4j.Level; import org.apache.log4j.Logger; import org.apache.thrift.server.THsHaServer; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.Timeout; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -44,6 +46,9 @@ import static org.junit.Assert.assertTrue; public class OracleIT extends ITBaseImpl { + @Rule + public Timeout globalTimeout = Timeout.seconds(60); + @Test public void testRestart() throws Exception { OracleClient client = env.getSharedResources().getOracleClient(); @@ -225,10 +230,8 @@ public class OracleIT extends ITBaseImpl { oserver.stop(); sleepWhileConnected(oserver); - int count = 0; - while (count < 5 && client.getOracle() != null) { - Thread.sleep(1000); - count++; + while (client.getOracle() != null) { + Thread.sleep(100); } assertNull(client.getOracle());