This is an automated email from the ASF dual-hosted git repository.
kenhuuu pushed a commit to branch tx-reuse-it
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/tx-reuse-it by this push:
new e7099e0094 remove extra logging
e7099e0094 is described below
commit e7099e00942d0954cc6c1b4648cc12d3f6364989
Author: Ken Hu <[email protected]>
AuthorDate: Tue Jan 13 18:12:37 2026 -0800
remove extra logging
---
.../server/GremlinSessionReuseTxIntegrateTest.java | 36 ++++++++++++++--------
1 file changed, 24 insertions(+), 12 deletions(-)
diff --git
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinSessionReuseTxIntegrateTest.java
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinSessionReuseTxIntegrateTest.java
index 02c64a0b95..5603b651be 100644
---
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinSessionReuseTxIntegrateTest.java
+++
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinSessionReuseTxIntegrateTest.java
@@ -63,8 +63,7 @@ public class GremlinSessionReuseTxIntegrateTest extends
AbstractSessionTxIntegra
@Test
public void shouldCleanupResourcesAfterSuccessfulCommit() throws Exception
{
- final LogCaptor logCaptor = LogCaptor.forRoot();
- logCaptor.setLogLevelToDebug();
+ final LogCaptor logCaptor = setUpLogCaptor();
final Cluster cluster = createCluster();
final GraphTraversalSource g =
traversal().withRemote(DriverRemoteConnection.using(cluster));
@@ -80,12 +79,12 @@ public class GremlinSessionReuseTxIntegrateTest extends
AbstractSessionTxIntegra
assertEquals(1, (long) g.V().count().next());
cluster.close();
- logCaptor.close();
+ resetLogCaptor(logCaptor);
}
@Test
public void shouldCleanupResourcesAfterSuccessfulRollback() throws
Exception {
- final LogCaptor logCaptor = LogCaptor.forRoot();
+ final LogCaptor logCaptor = setUpLogCaptor();
logCaptor.setLogLevelToDebug();
final Cluster cluster = createCluster();
@@ -102,7 +101,7 @@ public class GremlinSessionReuseTxIntegrateTest extends
AbstractSessionTxIntegra
assertEquals(0, (long) g.V().count().next());
cluster.close();
- logCaptor.close();
+ resetLogCaptor(logCaptor);
}
@Test
@@ -127,7 +126,7 @@ public class GremlinSessionReuseTxIntegrateTest extends
AbstractSessionTxIntegra
@Test
public void shouldAllowMultipleTransactionsOnDifferentConnection() throws
Exception {
- final LogCaptor logCaptor = LogCaptor.forRoot();
+ final LogCaptor logCaptor = setUpLogCaptor();
logCaptor.setLogLevelToDebug();
final Pattern channelCountPattern = Pattern.compile("Session closed
for.*count\\s(.*)");
@@ -165,12 +164,12 @@ public class GremlinSessionReuseTxIntegrateTest extends
AbstractSessionTxIntegra
assertEquals(2, channelIds.size());
cluster.close();
- logCaptor.close();
+ resetLogCaptor(logCaptor);
}
@Test
public void shouldAllowMultipleTransactionsOnSameConnection() throws
Exception {
- final LogCaptor logCaptor = LogCaptor.forRoot();
+ final LogCaptor logCaptor = setUpLogCaptor();
logCaptor.setLogLevelToDebug();
// Cluster setup that has a single connection so simultaneous
transactions must share it.
@@ -200,12 +199,12 @@ public class GremlinSessionReuseTxIntegrateTest extends
AbstractSessionTxIntegra
assertClientAndServerSessionResourcesClosed(logCaptor.getLogs());
cluster.close();
- logCaptor.close();
+ resetLogCaptor(logCaptor);
}
@Test
public void shouldReuseSameConnectionForSubsequentTransactionAfterCommit()
throws Exception {
- final LogCaptor logCaptor = LogCaptor.forRoot();
+ final LogCaptor logCaptor = setUpLogCaptor();
logCaptor.setLogLevelToDebug();
String channelId = "";
@@ -251,12 +250,12 @@ public class GremlinSessionReuseTxIntegrateTest extends
AbstractSessionTxIntegra
assertEquals(2, (long) g.V().count().next());
cluster.close();
- logCaptor.close();
+ resetLogCaptor(logCaptor);
}
@Test
public void
shouldReuseSameConnectionForSubsequentTransactionAfterRollback() throws
Exception {
- final LogCaptor logCaptor = LogCaptor.forRoot();
+ final LogCaptor logCaptor = setUpLogCaptor();
logCaptor.setLogLevelToDebug();
String channelId = "";
@@ -298,6 +297,19 @@ public class GremlinSessionReuseTxIntegrateTest extends
AbstractSessionTxIntegra
assertEquals(1, (long) g.V().count().next());
cluster.close();
+ resetLogCaptor(logCaptor);
+ }
+
+ private LogCaptor setUpLogCaptor() {
+ final LogCaptor logCaptor = LogCaptor.forRoot();
+ logCaptor.setLogLevelToDebug();
+ return logCaptor;
+ }
+
+ // Needed to prevent other long running tests that don't require the
LogCaptor from accidentally logging.
+ private void resetLogCaptor(final LogCaptor logCaptor) {
+ logCaptor.clearLogs();
+ logCaptor.resetLogLevel();
logCaptor.close();
}