You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2016/02/13 00:16:17 UTC
[5/9] incubator-tinkerpop git commit: Extend
GremlinServerIntegrateTest::shouldFailOnDeadHost to restart and reconnect.
Extend GremlinServerIntegrateTest::shouldFailOnDeadHost to restart and reconnect.
TINKERPOP-1126
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/457ef48e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/457ef48e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/457ef48e
Branch: refs/heads/tp31
Commit: 457ef48e464f5122daccf29ff8dd991c54d16d06
Parents: a326464
Author: Kieran Sherlock <ki...@identitymind.com>
Authored: Tue Feb 9 20:43:36 2016 -0800
Committer: Kieran Sherlock <ki...@identitymind.com>
Committed: Tue Feb 9 20:53:10 2016 -0800
----------------------------------------------------------------------
.../AbstractGremlinServerIntegrationTest.java | 4 ++++
.../server/GremlinServerIntegrateTest.java | 19 +++++++++++++++----
2 files changed, 19 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/457ef48e/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java
index fd8762a..ba47218 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/AbstractGremlinServerIntegrationTest.java
@@ -58,6 +58,10 @@ public abstract class AbstractGremlinServerIntegrationTest {
logger.info("* Testing: " + name.getMethodName());
logger.info("* Epoll option enabled:" + GREMLIN_SERVER_EPOLL);
+ startServer();
+ }
+
+ public void startServer() throws Exception {
final InputStream stream = getSettingsInputStream();
final Settings settings = Settings.read(stream);
final Settings overridenSettings = overrideSettings(settings);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/457ef48e/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
index df515bd..c64cf8b 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
@@ -21,10 +21,7 @@ package org.apache.tinkerpop.gremlin.server;
import java.io.File;
import org.apache.commons.lang.exception.ExceptionUtils;
import org.apache.log4j.Logger;
-import org.apache.tinkerpop.gremlin.driver.Client;
-import org.apache.tinkerpop.gremlin.driver.Cluster;
-import org.apache.tinkerpop.gremlin.driver.ResultSet;
-import org.apache.tinkerpop.gremlin.driver.Tokens;
+import org.apache.tinkerpop.gremlin.driver.*;
import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
@@ -551,6 +548,20 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
fail();
} catch (RuntimeException re) {
assertTrue(re.getCause().getCause() instanceof ClosedChannelException);
+
+ //
+ // should recover when the server comes back
+ //
+
+ // restart server
+ this.startServer();
+ // the retry interval is 1 second, wait a bit longer
+ TimeUnit.SECONDS.sleep(5);
+
+ List<Result> results = client.submit("1+1").all().join();
+ assertEquals(1, results.size());
+ assertEquals(2, results.get(0).getInt());
+
} finally {
cluster.close();
}