commit 389d00700628f5f3dce4658845896d5c366a33d3
author Keith Turner <kturner@apache.org> Tue Oct 25 18:18:23 2016 -0400
committer Keith Turner <kturner@apache.org> Tue Oct 25 18:18:23 2016 -0400
tree b446b5e0a742351e27b2164417c2c3400422a59c
parent d99a6e0fa87599f34ca76c9e720af2ab7b8864b5
parent 2bf94b1d4b9a69cb55acd49259aac68b0b210c7f

Merge branch 'fluo-762'

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.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 @@
 
 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 @@
     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());