Skip to content

Commit 6bbf3af

Browse files
committed
Merge branch '2.5.x' into 2.6.x
Closes gh-30164
2 parents 4c1d1a6 + eef89c6 commit 6bbf3af

File tree

5 files changed

+20
-16
lines changed

5 files changed

+20
-16
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,10 @@ class CassandraAutoConfigurationIntegrationTests {
4949
.withConfiguration(AutoConfigurations.of(CassandraAutoConfiguration.class)).withPropertyValues(
5050
"spring.data.cassandra.contact-points:" + cassandra.getHost() + ":"
5151
+ cassandra.getFirstMappedPort(),
52-
"spring.data.cassandra.local-datacenter=datacenter1", "spring.data.cassandra.request.timeout=20s",
53-
"spring.data.cassandra.connection.init-query-timeout=20s",
54-
"spring.data.cassandra.request.timeout=20s");
52+
"spring.data.cassandra.local-datacenter=datacenter1",
53+
"spring.data.cassandra.connection.connect-timeout=60s",
54+
"spring.data.cassandra.connection.init-query-timeout=60s",
55+
"spring.data.cassandra.request.timeout=60s");
5556

5657
@Test
5758
void whenTheContextIsClosedThenTheDriverConfigLoaderIsClosed() {

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,10 @@ class CassandraAutoConfigurationWithPasswordAuthenticationIntegrationTests {
5858
.withConfiguration(AutoConfigurations.of(CassandraAutoConfiguration.class)).withPropertyValues(
5959
"spring.data.cassandra.contact-points:" + cassandra.getHost() + ":"
6060
+ cassandra.getFirstMappedPort(),
61-
"spring.data.cassandra.local-datacenter=datacenter1", "spring.data.cassandra.request.timeout=20s",
62-
"spring.data.cassandra.connection.init-query-timeout=10s");
61+
"spring.data.cassandra.local-datacenter=datacenter1",
62+
"spring.data.cassandra.connection.connect-timeout=60s",
63+
"spring.data.cassandra.connection.init-query-timeout=60s",
64+
"spring.data.cassandra.request.timeout=60s");
6365

6466
@Test
6567
void authenticationWithValidUsernameAndPassword() {

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -54,9 +54,10 @@ class CassandraDataAutoConfigurationIntegrationTests {
5454
.withPropertyValues(
5555
"spring.data.cassandra.contact-points:" + cassandra.getHost() + ":"
5656
+ cassandra.getFirstMappedPort(),
57-
"spring.data.cassandra.local-datacenter=datacenter1", "spring.data.cassandra.request.timeout=20s",
58-
"spring.data.cassandra.connection.init-query-timeout=20s",
59-
"spring.data.cassandra.request.timeout=20s")
57+
"spring.data.cassandra.local-datacenter=datacenter1",
58+
"spring.data.cassandra.connection.connect-timeout=60s",
59+
"spring.data.cassandra.connection.init-query-timeout=60s",
60+
"spring.data.cassandra.request.timeout=60s")
6061
.withInitializer((context) -> AutoConfigurationPackages.register((BeanDefinitionRegistry) context,
6162
City.class.getPackage().getName()));
6263

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -45,8 +45,8 @@
4545
*/
4646
@DataCassandraTest(properties = { "spring.data.cassandra.local-datacenter=datacenter1",
4747
"spring.data.cassandra.schema-action=create-if-not-exists",
48-
"spring.data.cassandra.connection.connect-timeout=20s",
49-
"spring.data.cassandra.connection.init-query-timeout=20s", "spring.data.cassandra.request.timeout=20s" })
48+
"spring.data.cassandra.connection.connect-timeout=60s",
49+
"spring.data.cassandra.connection.init-query-timeout=60s", "spring.data.cassandra.request.timeout=60s" })
5050
@Testcontainers(disabledWithoutDocker = true)
5151
class DataCassandraTestIntegrationTests {
5252

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -44,9 +44,9 @@
4444
@DataCassandraTest(includeFilters = @Filter(Service.class),
4545
properties = { "spring.data.cassandra.local-datacenter=datacenter1",
4646
"spring.data.cassandra.schema-action=create-if-not-exists",
47-
"spring.data.cassandra.connection.connect-timeout=20s",
48-
"spring.data.cassandra.connection.init-query-timeout=20s",
49-
"spring.data.cassandra.request.timeout=20s" })
47+
"spring.data.cassandra.connection.connect-timeout=60s",
48+
"spring.data.cassandra.connection.init-query-timeout=60s",
49+
"spring.data.cassandra.request.timeout=60s" })
5050
@Testcontainers(disabledWithoutDocker = true)
5151
class DataCassandraTestWithIncludeFilterIntegrationTests {
5252

0 commit comments

Comments
 (0)