From 06a3c405063621f3aaeb3940720b1bad348f4dca Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 16 Jul 2021 15:45:49 +0100 Subject: [PATCH] Use a 10s init query timeout in Cassandra tests Closes gh-27368 --- .../data/cassandra/DataCassandraTestIntegrationTests.java | 2 +- .../DataCassandraTestWithIncludeFilterIntegrationTests.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestIntegrationTests.java index 5dee68c0c7..26512e3b02 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestIntegrationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestIntegrationTests.java @@ -48,7 +48,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @DataCassandraTest(properties = { "spring.data.cassandra.local-datacenter=datacenter1", "spring.data.cassandra.schema-action=create-if-not-exists", "spring.data.cassandra.connection.connect-timeout=20s", - "spring.data.cassandra.connection.init-query-timeout=2s", "spring.data.cassandra.request.timeout=10s" }) + "spring.data.cassandra.connection.init-query-timeout=10s", "spring.data.cassandra.request.timeout=10s" }) @Testcontainers(disabledWithoutDocker = true) class DataCassandraTestIntegrationTests { diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestWithIncludeFilterIntegrationTests.java b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestWithIncludeFilterIntegrationTests.java index 4e898f9f4a..afd43a4de3 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestWithIncludeFilterIntegrationTests.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestWithIncludeFilterIntegrationTests.java @@ -47,7 +47,8 @@ import static org.assertj.core.api.Assertions.assertThat; properties = { "spring.data.cassandra.local-datacenter=datacenter1", "spring.data.cassandra.schema-action=create-if-not-exists", "spring.data.cassandra.connection.connect-timeout=20s", - "spring.data.cassandra.connection.init-query-timeout=2s", "spring.data.cassandra.request.timeout=10s" }) + "spring.data.cassandra.connection.init-query-timeout=10s", + "spring.data.cassandra.request.timeout=10s" }) @Testcontainers(disabledWithoutDocker = true) class DataCassandraTestWithIncludeFilterIntegrationTests {