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 2022/01/06 01:30:34 UTC
[tinkerpop] branch master updated (c969444 -> 6e43bdb)
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from c969444 Merge pull request #1537 from bechbd/master
add 511539b Added user-friendly console message and fixed possible console remote leak
new c76df03 Minor fix to test CTR
new befc7c2 Merge branch '3.4-dev' into 3.5-dev
new 6e43bdb Merge branch '3.5-dev'
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGELOG.asciidoc | 1 +
.../tinkerpop/gremlin/console/commands/RemoteCommand.groovy | 3 ++-
.../gremlin/console/jsr223/DriverRemoteAcceptor.java | 9 +++++++++
.../gremlin/console/jsr223/DriverRemoteAcceptorTest.java | 12 ++++++++----
.../tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java | 7 +++++++
5 files changed, 27 insertions(+), 5 deletions(-)
[tinkerpop] 03/03: Merge branch '3.5-dev'
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 6e43bdbaea2cf2c7b1fd5e9cf9d1234dbb709600
Merge: c969444 befc7c2
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Wed Jan 5 20:30:25 2022 -0500
Merge branch '3.5-dev'
CHANGELOG.asciidoc | 1 +
.../tinkerpop/gremlin/console/commands/RemoteCommand.groovy | 3 ++-
.../gremlin/console/jsr223/DriverRemoteAcceptor.java | 9 +++++++++
.../gremlin/console/jsr223/DriverRemoteAcceptorTest.java | 12 ++++++++----
.../tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java | 7 +++++++
5 files changed, 27 insertions(+), 5 deletions(-)
[tinkerpop] 02/03: Merge branch '3.4-dev' into 3.5-dev
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit befc7c2fcc718abb91ef96df775443abe1ae4ab5
Merge: 5e48db8 c76df03
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Wed Jan 5 20:30:12 2022 -0500
Merge branch '3.4-dev' into 3.5-dev
CHANGELOG.asciidoc | 1 +
.../tinkerpop/gremlin/console/commands/RemoteCommand.groovy | 3 ++-
.../gremlin/console/jsr223/DriverRemoteAcceptor.java | 9 +++++++++
.../gremlin/console/jsr223/DriverRemoteAcceptorTest.java | 12 ++++++++----
.../tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java | 7 +++++++
5 files changed, 27 insertions(+), 5 deletions(-)
diff --cc gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
index 7f78dd5,f8f5f09..d8f095b
--- 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
@@@ -1853,8 -1897,15 +1853,15 @@@ public class GremlinDriverIntegrateTes
} catch (Exception re) {
// Client would have no active connections to the host, hence it would encounter a timeout
// trying to find an alive connection to the host.
- assertThat(re.getCause(), instanceOf(NoHostAvailableException.class));
+ assertThat(re, instanceOf(NoHostAvailableException.class));
+ try {
+ client.submit("1+1").all().get(3000, TimeUnit.MILLISECONDS);
+ fail("Should throw exception on the retry");
+ } catch (RuntimeException re2) {
+ assertThat(re2.getCause(), instanceOf(NoHostAvailableException.class));
+ }
+
//
// should recover when the server comes back
//
[tinkerpop] 01/03: Minor fix to test CTR
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit c76df03747ff9826f3cb0658880e87ae7b85b704
Author: Stephen Mallette <st...@amazon.com>
AuthorDate: Wed Jan 5 20:29:38 2022 -0500
Minor fix to test CTR
---
.../org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java | 1 +
1 file changed, 1 insertion(+)
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 7c63341..f8f5f09 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
@@ -1901,6 +1901,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
try {
client.submit("1+1").all().get(3000, TimeUnit.MILLISECONDS);
+ fail("Should throw exception on the retry");
} catch (RuntimeException re2) {
assertThat(re2.getCause(), instanceOf(NoHostAvailableException.class));
}