From cf0036992ffe255528df10714f723661cfcf1553 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 25 Aug 2020 16:33:26 +0100 Subject: [PATCH] Increase timeouts used in Cassandra integration tests Closes gh-23083 --- .../data/cassandra/DataCassandraTestIntegrationTests.java | 3 ++- .../DataCassandraTestWithIncludeFilterIntegrationTests.java | 3 ++- 2 files changed, 4 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 bc8897966c..ce0242f3ef 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 @@ -46,7 +46,8 @@ 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=10s", "spring.data.cassandra.request.timeout=5s" }) + "spring.data.cassandra.connection.connect-timeout=20s", + "spring.data.cassandra.connection.init-query-timeout=2s", "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 b1baff51ce..dab1d8c9cd 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 @@ -45,7 +45,8 @@ import static org.assertj.core.api.Assertions.assertThat; @DataCassandraTest(includeFilters = @Filter(Service.class), properties = { "spring.data.cassandra.local-datacenter=datacenter1", "spring.data.cassandra.schema-action=create-if-not-exists", - "spring.data.cassandra.connection.connect-timeout=10s", "spring.data.cassandra.request.timeout=5s" }) + "spring.data.cassandra.connection.connect-timeout=20s", + "spring.data.cassandra.connection.init-query-timeout=2s", "spring.data.cassandra.request.timeout=10s" }) @Testcontainers(disabledWithoutDocker = true) class DataCassandraTestWithIncludeFilterIntegrationTests {