This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch ci-fix
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/ci-fix by this push:
new d63bcba Close Cluster instances after tests
d63bcba is described below
commit d63bcbacbe15d98078ee46c8f98773812448d888
Author: Stephen Mallette <[email protected]>
AuthorDate: Wed Dec 29 07:19:34 2021 -0500
Close Cluster instances after tests
---
.../gremlin/server/GremlinDriverIntegrateTest.java | 79 +++++++++++-----------
1 file changed, 39 insertions(+), 40 deletions(-)
diff --git
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
index 9b4129c..74f1bdb 100644
---
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
+++
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
@@ -1020,7 +1020,6 @@ public class GremlinDriverIntegrateTest extends
AbstractGremlinServerIntegration
final Client client = cluster.connect();
try {
-
final List<Result> r =
client.submit("TinkerFactory.createModern().traversal().V(1)").all().join();
assertEquals(1, r.size());
@@ -1500,9 +1499,9 @@ public class GremlinDriverIntegrateTest extends
AbstractGremlinServerIntegration
assertThat(root, instanceOf(ResponseException.class));
final ResponseException re = (ResponseException) root;
assertEquals(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS,
re.getResponseStatusCode());
+ } finally {
+ cluster.close();
}
-
- cluster.close();
}
@Test
@@ -1520,13 +1519,13 @@ public class GremlinDriverIntegrateTest extends
AbstractGremlinServerIntegration
assertThat(root, instanceOf(ResponseException.class));
final ResponseException re = (ResponseException) root;
assertEquals(ResponseStatusCode.REQUEST_ERROR_INVALID_REQUEST_ARGUMENTS,
re.getResponseStatusCode());
- }
-
- final Client rebound = cluster.connect().alias("graph");
- final Vertex v =
rebound.submit("g.addVertex('name','jason')").all().get().get(0).getVertex();
- assertEquals("jason", v.value("name"));
- cluster.close();
+ final Client rebound = cluster.connect().alias("graph");
+ final Vertex v =
rebound.submit("g.addVertex('name','jason')").all().get().get(0).getVertex();
+ assertEquals("jason", v.value("name"));
+ } finally {
+ cluster.close();
+ }
}
@Test
@@ -1542,13 +1541,13 @@ public class GremlinDriverIntegrateTest extends
AbstractGremlinServerIntegration
assertThat(root, instanceOf(ResponseException.class));
final ResponseException re = (ResponseException) root;
assertEquals(ResponseStatusCode.SERVER_ERROR_SCRIPT_EVALUATION,
re.getResponseStatusCode());
- }
-
- final Client rebound = cluster.connect().alias("graph");
- final Vertex v =
rebound.submit("g.addVertex('name','jason')").all().get().get(0).getVertex();
- assertEquals("jason", v.value("name"));
- cluster.close();
+ final Client rebound = cluster.connect().alias("graph");
+ final Vertex v =
rebound.submit("g.addVertex('name','jason')").all().get().get(0).getVertex();
+ assertEquals("jason", v.value("name"));
+ } finally {
+ cluster.close();
+ }
}
@Test
@@ -1784,6 +1783,7 @@ public class GremlinDriverIntegrateTest extends
AbstractGremlinServerIntegration
final Client client = Mockito.spy(cluster.connect().alias("g"));
client.submit("",
RequestOptions.build().userAgent("test").create()).all().get();
cluster.close();
+
final ArgumentCaptor<RequestMessage> requestMessageCaptor =
ArgumentCaptor.forClass(RequestMessage.class);
verify(client).submitAsync(requestMessageCaptor.capture());
final RequestMessage requestMessage = requestMessageCaptor.getValue();
@@ -1798,14 +1798,15 @@ public class GremlinDriverIntegrateTest extends
AbstractGremlinServerIntegration
final GraphTraversalSource g =
traversal().withRemote(DriverRemoteConnection.using(client));
g.with(Tokens.ARGS_USER_AGENT, "test").V().iterate();
cluster.close();
- ArgumentCaptor<RequestOptions> requestOptionsCaptor =
ArgumentCaptor.forClass(RequestOptions.class);
+
+ final ArgumentCaptor<RequestOptions> requestOptionsCaptor =
ArgumentCaptor.forClass(RequestOptions.class);
verify(client).submitAsync(Mockito.any(Bytecode.class),
requestOptionsCaptor.capture());
- RequestOptions requestOptions = requestOptionsCaptor.getValue();
+ final RequestOptions requestOptions = requestOptionsCaptor.getValue();
assertEquals("test", requestOptions.getUserAgent().get());
- ArgumentCaptor<RequestMessage> requestMessageCaptor =
ArgumentCaptor.forClass(RequestMessage.class);
+ final ArgumentCaptor<RequestMessage> requestMessageCaptor =
ArgumentCaptor.forClass(RequestMessage.class);
verify(client).submitAsync(requestMessageCaptor.capture());
- RequestMessage requestMessage = requestMessageCaptor.getValue();
+ final RequestMessage requestMessage = requestMessageCaptor.getValue();
assertEquals("test",
requestMessage.getArgs().getOrDefault(Tokens.ARGS_USER_AGENT, null));
}
@@ -1813,32 +1814,29 @@ public class GremlinDriverIntegrateTest extends
AbstractGremlinServerIntegration
public void shouldSendRequestIdBytecode() {
final UUID overrideRequestId = UUID.randomUUID();
final Cluster cluster =
TestClientFactory.build().serializer(Serializers.GRAPHSON_V3D0).create();
- final Client client = Mockito.spy(cluster.connect().alias("g"));
- Mockito.when(client.alias("g")).thenReturn(client);
- GraphTraversalSource g =
traversal().withRemote(DriverRemoteConnection.using(client));
- g.with(Tokens.REQUEST_ID, overrideRequestId).V().iterate();
- cluster.close();
- ArgumentCaptor<RequestOptions> requestOptionsCaptor =
ArgumentCaptor.forClass(RequestOptions.class);
- verify(client).submitAsync(Mockito.any(Bytecode.class),
requestOptionsCaptor.capture());
- RequestOptions requestOptions = requestOptionsCaptor.getValue();
- assertTrue(requestOptions.getOverrideRequestId().isPresent());
- assertEquals(overrideRequestId,
requestOptions.getOverrideRequestId().get());
+ final Client client = Mockito.spy(cluster.connect().alias("g"));
+ Mockito.when(client.alias("g")).thenReturn(client);
+ final GraphTraversalSource g =
traversal().withRemote(DriverRemoteConnection.using(client));
+ g.with(Tokens.REQUEST_ID, overrideRequestId).V().iterate();
+ cluster.close();
- ArgumentCaptor<RequestMessage> requestMessageCaptor =
ArgumentCaptor.forClass(RequestMessage.class);
- verify(client).submitAsync(requestMessageCaptor.capture());
- RequestMessage requestMessage = requestMessageCaptor.getValue();
- assertEquals(overrideRequestId, requestMessage.getRequestId());
+ final ArgumentCaptor<RequestOptions> requestOptionsCaptor =
ArgumentCaptor.forClass(RequestOptions.class);
+ verify(client).submitAsync(Mockito.any(Bytecode.class),
requestOptionsCaptor.capture());
+ final RequestOptions requestOptions = requestOptionsCaptor.getValue();
+ assertTrue(requestOptions.getOverrideRequestId().isPresent());
+ assertEquals(overrideRequestId,
requestOptions.getOverrideRequestId().get());
+ final ArgumentCaptor<RequestMessage> requestMessageCaptor =
ArgumentCaptor.forClass(RequestMessage.class);
+ verify(client).submitAsync(requestMessageCaptor.capture());
+ final RequestMessage requestMessage = requestMessageCaptor.getValue();
+ assertEquals(overrideRequestId, requestMessage.getRequestId());
}
private void assertFutureTimeout(final CompletableFuture<List<Result>>
futureFirst) {
- try
- {
+ try {
futureFirst.get();
fail("Should have timed out");
- }
- catch (Exception ex)
- {
+ } catch (Exception ex) {
final Throwable root = ExceptionUtils.getRootCause(ex);
assertThat(root, instanceOf(ResponseException.class));
assertThat(root.getMessage(), startsWith("Evaluation exceeded the
configured 'evaluationTimeout' threshold of 250 ms"));
@@ -1871,9 +1869,10 @@ public class GremlinDriverIntegrateTest extends
AbstractGremlinServerIntegration
// should get a rejection here
final Throwable root = ExceptionUtils.getRootCause(ex);
assertThat(root.getMessage(), startsWith("There is already a
request pending with an id of:"));
+ assertEquals(100, result1.get().one().getInt());
+ } finally {
+ cluster.close();
}
-
- assertEquals(100, result1.get().one().getInt());
}
/**
