You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fluo.apache.org by kt...@apache.org on 2016/10/25 21:35:21 UTC
[1/2] incubator-fluo git commit: fixes #791 give Oracle more time to
stop in IT
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 <kt...@apache.org>
Authored: Mon Oct 24 17:44:31 2016 -0400
Committer: Keith Turner <kt...@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());
[2/2] incubator-fluo git commit: Merge branch 'fluo-791'
Posted by kt...@apache.org.
Merge branch 'fluo-791'
Project: http://git-wip-us.apache.org/repos/asf/incubator-fluo/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fluo/commit/d99a6e0f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo/tree/d99a6e0f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo/diff/d99a6e0f
Branch: refs/heads/master
Commit: d99a6e0fa87599f34ca76c9e720af2ab7b8864b5
Parents: 1d243c3 34d8944
Author: Keith Turner <kt...@apache.org>
Authored: Tue Oct 25 17:34:47 2016 -0400
Committer: Keith Turner <kt...@apache.org>
Committed: Tue Oct 25 17:34:47 2016 -0400
----------------------------------------------------------------------
.../java/org/apache/fluo/integration/impl/OracleIT.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------