root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Increase timeouts in tests that use Cassandra 

Closes gh-30163
This commit is contained in:
Andy Wilkinson 2022-03-10 16:50:39 +00:00
parent 6eacc07de0
commit bbdef2b026
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationIntegrationTests.java
View File

@ -50,7 +50,8 @@ class CassandraAutoConfigurationIntegrationTests {
"spring.data.cassandra.contact-points:" + cassandra.getHost() + ":" "spring.data.cassandra.contact-points:" + cassandra.getHost() + ":"
+ cassandra.getFirstMappedPort(), + cassandra.getFirstMappedPort(),
"spring.data.cassandra.local-datacenter=datacenter1", "spring.data.cassandra.request.timeout=20s", "spring.data.cassandra.local-datacenter=datacenter1", "spring.data.cassandra.request.timeout=20s",
"spring.data.cassandra.connection.init-query-timeout=10s"); "spring.data.cassandra.connection.init-query-timeout=20s",
"spring.data.cassandra.request.timeout=20s");
@Test @Test
void whenTheContextIsClosedThenTheDriverConfigLoaderIsClosed() { void whenTheContextIsClosedThenTheDriverConfigLoaderIsClosed() {

4
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java
View File

@ -55,8 +55,8 @@ class CassandraDataAutoConfigurationIntegrationTests {
"spring.data.cassandra.contact-points:" + cassandra.getHost() + ":" "spring.data.cassandra.contact-points:" + cassandra.getHost() + ":"
+ cassandra.getFirstMappedPort(), + cassandra.getFirstMappedPort(),
"spring.data.cassandra.local-datacenter=datacenter1", "spring.data.cassandra.request.timeout=20s", "spring.data.cassandra.local-datacenter=datacenter1", "spring.data.cassandra.request.timeout=20s",
"spring.data.cassandra.connection.init-query-timeout=10s", "spring.data.cassandra.connection.init-query-timeout=20s",
"spring.data.cassandra.request.timeout=10s") "spring.data.cassandra.request.timeout=20s")
.withInitializer((context) -> AutoConfigurationPackages.register((BeanDefinitionRegistry) context, .withInitializer((context) -> AutoConfigurationPackages.register((BeanDefinitionRegistry) context,
City.class.getPackage().getName())); City.class.getPackage().getName()));

2
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestIntegrationTests.java
View File

@ -46,7 +46,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@DataCassandraTest(properties = { "spring.data.cassandra.local-datacenter=datacenter1", @DataCassandraTest(properties = { "spring.data.cassandra.local-datacenter=datacenter1",
"spring.data.cassandra.schema-action=create-if-not-exists", "spring.data.cassandra.schema-action=create-if-not-exists",
"spring.data.cassandra.connection.connect-timeout=20s", "spring.data.cassandra.connection.connect-timeout=20s",
"spring.data.cassandra.connection.init-query-timeout=10s", "spring.data.cassandra.request.timeout=10s" }) "spring.data.cassandra.connection.init-query-timeout=20s", "spring.data.cassandra.request.timeout=20s" })
@Testcontainers(disabledWithoutDocker = true) @Testcontainers(disabledWithoutDocker = true)
class DataCassandraTestIntegrationTests { class DataCassandraTestIntegrationTests {

4
spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/cassandra/DataCassandraTestWithIncludeFilterIntegrationTests.java
View File

@ -45,8 +45,8 @@ import static org.assertj.core.api.Assertions.assertThat;
properties = { "spring.data.cassandra.local-datacenter=datacenter1", properties = { "spring.data.cassandra.local-datacenter=datacenter1",
"spring.data.cassandra.schema-action=create-if-not-exists", "spring.data.cassandra.schema-action=create-if-not-exists",
"spring.data.cassandra.connection.connect-timeout=20s", "spring.data.cassandra.connection.connect-timeout=20s",
"spring.data.cassandra.connection.init-query-timeout=10s", "spring.data.cassandra.connection.init-query-timeout=20s",
"spring.data.cassandra.request.timeout=10s" }) "spring.data.cassandra.request.timeout=20s" })
@Testcontainers(disabledWithoutDocker = true) @Testcontainers(disabledWithoutDocker = true)
class DataCassandraTestWithIncludeFilterIntegrationTests { class DataCassandraTestWithIncludeFilterIntegrationTests {