Merge branch '2.7.x' into 3.0.x

Closes gh-36663
1 year ago · 51b81ced6f
parent 06cb28d306 28b3054a9e
commit 51b81ced6f
1 changed files with 2 additions and 1 deletions
--- a/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/couchbase/DataCouchbaseTestIntegrationTests.java
+++ b/spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/couchbase/DataCouchbaseTestIntegrationTests.java
@ -40,7 +40,8 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 *
 * @author Eddú Meléndez
 */
-@DataCouchbaseTest(properties = "spring.couchbase.env.timeouts.connect=2m")
+@DataCouchbaseTest(
+		properties = { "spring.couchbase.env.timeouts.connect=2m", "spring.couchbase.env.timeouts.key-value=1m" })
@Testcontainers(disabledWithoutDocker = true)
 class DataCouchbaseTestIntegrationTests {