[tinkerpop] branch master updated: Harden testing around driver integration test CTR

[spmallette]

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


The following commit(s) were added to refs/heads/master by this push:
     new d2835bb  Harden testing around driver integration test CTR
     new cae6a96  Merge branch '3.5-dev'
d2835bb is described below

commit d2835bbe828952391c632cf33a69c45dd7896b6c
Author: Stephen Mallette <stepm...@amazon.com>
AuthorDate: Tue Dec 21 13:46:28 2021 -0500

    Harden testing around driver integration test CTR
---
 .../tinkerpop/gremlin/driver/ClientConnectionIntegrateTest.java      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/ClientConnectionIntegrateTest.java
 
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/ClientConnectionIntegrateTest.java
index 962cfc2..8ebad78 100644
--- 
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/ClientConnectionIntegrateTest.java
+++ 
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/ClientConnectionIntegrateTest.java
@@ -90,8 +90,9 @@ public class ClientConnectionIntegrateTest extends 
AbstractGremlinServerIntegrat
             }
 
             // without this wait this test is failing randomly on 
docker/travis with ConcurrentModificationException
-            // see TINKERPOP-2504
-            Thread.sleep(3000);
+            // see TINKERPOP-2504 - adjust the sleep to account for the max 
time to wait for sessions to close in
+            // an orderly fashion
+            Thread.sleep(Connection.MAX_WAIT_FOR_CLOSE + 1000);
 
             // Assert that the host has not been marked unavailable
             assertEquals(1, cluster.availableHosts().size());