fluo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject [1/2] incubator-fluo git commit: fixes #791 give Oracle more time to stop in IT
Date Tue, 25 Oct 2016 21:35:21 GMT
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 <kturner@apache.org>
Authored: Mon Oct 24 17:44:31 2016 -0400
Committer: Keith Turner <kturner@apache.org>
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());


Mime
View raw message