From 5eb9228d6002a0b62b2716e52e6acf9ce1e436d4 Mon Sep 17 00:00:00 2001 From: Sakthivel Subramanian Date: Wed, 4 Mar 2026 17:11:55 +0530 Subject: [PATCH 1/3] chore: increase awaitTermination timeout in ITBulkConnectionTest --- .../cloud/spanner/connection/it/ITBulkConnectionTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITBulkConnectionTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITBulkConnectionTest.java index 42358a647a1..8a91502434f 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITBulkConnectionTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/connection/it/ITBulkConnectionTest.java @@ -80,7 +80,7 @@ public void testBulkCreateConnectionsMultiThreaded() throws InterruptedException }); } executor.shutdown(); - executor.awaitTermination(10L, TimeUnit.SECONDS); + assertThat(executor.awaitTermination(60L, TimeUnit.SECONDS), is(true)); // close Spanner instances explicitly. This method will throw an exception if there are any // connections still open in the pool closeSpanner(); From b2ba7e5ee3546b205ca571c7367340e47c194ccb Mon Sep 17 00:00:00 2001 From: Sakthivel Subramanian Date: Wed, 4 Mar 2026 17:49:43 +0530 Subject: [PATCH 2/3] fix: add delay to mock session creation in testRetryWithNoSessionCreationWaitTime to fix flakiness --- .../MultiplexedSessionDatabaseClientMockServerTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MultiplexedSessionDatabaseClientMockServerTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MultiplexedSessionDatabaseClientMockServerTest.java index 629b5611862..34239d014bf 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MultiplexedSessionDatabaseClientMockServerTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MultiplexedSessionDatabaseClientMockServerTest.java @@ -337,7 +337,9 @@ public void testRetryWithTheDatabaseNotFoundExceptionWithSessionCreationWaitTime @Test public void testRetryWithNoSessionCreationWaitTime() { mockSpanner.setCreateSessionExecutionTime( - SimulatedExecutionTime.ofExceptions( + SimulatedExecutionTime.ofMinimumAndRandomTimeAndExceptions( + 100, + 0, Collections.singletonList( Status.DEADLINE_EXCEEDED .withDescription( From b1215730103e98791ad6cbc1a7f06223126cca15 Mon Sep 17 00:00:00 2001 From: cloud-java-bot Date: Wed, 4 Mar 2026 12:23:06 +0000 Subject: [PATCH 3/3] chore: generate libraries at Wed Mar 4 12:20:22 UTC 2026 --- .../spanner/MultiplexedSessionDatabaseClientMockServerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MultiplexedSessionDatabaseClientMockServerTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MultiplexedSessionDatabaseClientMockServerTest.java index 34239d014bf..245d42c4f10 100644 --- a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MultiplexedSessionDatabaseClientMockServerTest.java +++ b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/MultiplexedSessionDatabaseClientMockServerTest.java @@ -338,7 +338,7 @@ public void testRetryWithTheDatabaseNotFoundExceptionWithSessionCreationWaitTime public void testRetryWithNoSessionCreationWaitTime() { mockSpanner.setCreateSessionExecutionTime( SimulatedExecutionTime.ofMinimumAndRandomTimeAndExceptions( - 100, + 100, 0, Collections.singletonList( Status.DEADLINE_EXCEEDED