chore(spanner): fix tests in SessionPoolLeakTest

googleapis · Dec 19, 2024 · fed3041 · fed3041
1 parent b8de686
commit fed3041
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/...loud-spanner/src/main/java/com/google/cloud/spanner/MultiplexedSessionDatabaseClient.java b/...loud-spanner/src/main/java/com/google/cloud/spanner/MultiplexedSessionDatabaseClient.java
@@ -262,7 +262,7 @@ public void onSessionReady(SessionImpl session) {
                     .getOptions()
                     .getSessionPoolOptions()
                     .getSkipVerifyBeginTransactionForMuxRW()) {
-              
+
               verifyBeginTransactionWithRWOnMultiplexedSessionAsync(session.getName());
             }
           }

diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolLeakTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolLeakTest.java
@@ -171,6 +171,9 @@ public void testIgnoreLeakedSession() {
 
   @Test
   public void testReadWriteTransactionExceptionOnCreateSession() {
+    assumeFalse(
+        "Session Leaks do not occur with Multiplexed Sessions",
+        isMultiplexedSessionsEnabledForRW());
     readWriteTransactionTest(
         () ->
             mockSpanner.setBatchCreateSessionsExecutionTime(
@@ -180,6 +183,9 @@ public void testReadWriteTransactionExceptionOnCreateSession() {
 
   @Test
   public void testReadWriteTransactionExceptionOnBegin() {
+    assumeFalse(
+        "Session Leaks do not occur with Multiplexed Sessions",
+        isMultiplexedSessionsEnabledForRW());
     readWriteTransactionTest(
         () ->
             mockSpanner.setBeginTransactionExecutionTime(
@@ -200,6 +206,9 @@ private void readWriteTransactionTest(
 
   @Test
   public void testTransactionManagerExceptionOnCreateSession() {
+    assumeFalse(
+        "Session Leaks do not occur with Multiplexed Sessions",
+        isMultiplexedSessionsEnabledForRW());
     transactionManagerTest(
         () ->
             mockSpanner.setBatchCreateSessionsExecutionTime(
@@ -209,6 +218,9 @@ public void testTransactionManagerExceptionOnCreateSession() {
 
   @Test
   public void testTransactionManagerExceptionOnBegin() {
+    assumeFalse(
+        "Session Leaks do not occur with Multiplexed Sessions",
+        isMultiplexedSessionsEnabledForRW());
     assertThat(pool.getNumberOfSessionsInPool(), is(equalTo(0)));
     mockSpanner.setBeginTransactionExecutionTime(
         SimulatedExecutionTime.ofException(FAILED_PRECONDITION));
@@ -229,4 +241,11 @@ private void transactionManagerTest(Runnable setup, int expectedNumberOfSessions
     }
     assertEquals(expectedNumberOfSessionsAfterExecution, pool.getNumberOfSessionsInPool());
   }
+
+  private boolean isMultiplexedSessionsEnabledForRW() {
+    if (spanner.getOptions() == null || spanner.getOptions().getSessionPoolOptions() == null) {
+      return false;
+    }
+    return spanner.getOptions().getSessionPoolOptions().getUseMultiplexedSessionForRW();
+  }
 }