Skip to content
This repository was archived by the owner on Apr 7, 2026. It is now read-only.

Commit bf6ea91

Browse files
Skip multiplex session tests in regular session
1 parent b9106f2 commit bf6ea91

4 files changed

Lines changed: 15 additions & 4 deletions

File tree

google-cloud-spanner/src/test/java/com/google/cloud/spanner/MultiplexedSessionDatabaseClientMockServerTest.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,7 @@ public class MultiplexedSessionDatabaseClientMockServerTest extends AbstractMock
7070

7171
@BeforeClass
7272
public static void setupResults() {
73-
assumeFalse(
74-
System.getenv()
75-
.getOrDefault("GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS", "")
76-
.equalsIgnoreCase("false"));
73+
assumeFalse(TestHelper.isMultiplexSessionDisabled());
7774
mockSpanner.putStatementResults(
7875
StatementResult.query(STATEMENT, new RandomResultSetGenerator(1).generate()));
7976
mockSpanner.putStatementResult(StatementResult.update(UPDATE_STATEMENT, UPDATE_COUNT));

google-cloud-spanner/src/test/java/com/google/cloud/spanner/OpenTelemetryBuiltInMetricsTracerTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import static org.junit.Assert.assertThrows;
2525
import static org.junit.Assert.assertTrue;
2626
import static org.junit.Assert.fail;
27+
import static org.junit.Assume.assumeFalse;
2728

2829
import com.google.api.gax.longrunning.OperationTimedPollAlgorithm;
2930
import com.google.api.gax.retrying.RetrySettings;
@@ -255,6 +256,7 @@ public void testMetricsWithGaxRetryUnaryRpc() {
255256

256257
@Test
257258
public void testNoNetworkConnection() {
259+
assumeFalse(TestHelper.isMultiplexSessionDisabled());
258260
// Create a Spanner instance that tries to connect to a server that does not exist.
259261
// This simulates a bad network connection.
260262
SpannerOptions.Builder builder = SpannerOptions.newBuilder();

google-cloud-spanner/src/test/java/com/google/cloud/spanner/SessionPoolOptionsTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,7 @@ public void testRandomizePositionQPSThreshold() {
283283

284284
@Test
285285
public void testUseMultiplexedSession() {
286+
assumeFalse(TestHelper.isMultiplexSessionDisabled());
286287
// skip these tests since this configuration can have dual behaviour in different test-runners
287288
assumeFalse(SessionPoolOptions.newBuilder().build().getUseMultiplexedSession());
288289
assertEquals(false, SessionPoolOptions.newBuilder().build().getUseMultiplexedSession());
@@ -304,6 +305,7 @@ public void testUseMultiplexedSession() {
304305
@Test
305306
public void testUseMultiplexedSessionForRW() {
306307
// skip these tests since this configuration can have dual behaviour in different test-runners
308+
assumeFalse(TestHelper.isMultiplexSessionDisabled());
307309
assumeFalse(
308310
Boolean.parseBoolean(System.getenv("GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_FOR_RW")));
309311
assumeFalse(SessionPoolOptions.newBuilder().build().getUseMultiplexedSession());
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package com.google.cloud.spanner;
2+
3+
class TestHelper {
4+
5+
static boolean isMultiplexSessionDisabled() {
6+
return System.getenv()
7+
.getOrDefault("GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS", "")
8+
.equalsIgnoreCase("false");
9+
}
10+
}

0 commit comments

Comments
 (0)