From bdffa860d9b936d50f88993c45d23c83c1cd4023 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 8 Jan 2020 11:39:36 +0000 Subject: [PATCH] Increase startup timeout for Docker containers Closes gh-19569 --- .../CassandraDataAutoConfigurationIntegrationTests.java | 2 +- .../boot/testsupport/testcontainers/RedisContainer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java index 39897bef55..0ffdc11831 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java @@ -47,7 +47,7 @@ public class CassandraDataAutoConfigurationIntegrationTests { @ClassRule public static SkippableContainer> cassandra = new SkippableContainer<>( - () -> new CassandraContainer<>().withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(2))); + () -> new CassandraContainer<>().withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10))); private AnnotationConfigApplicationContext context; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/RedisContainer.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/RedisContainer.java index 29f75123fa..bf4594d91e 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/RedisContainer.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/RedisContainer.java @@ -31,7 +31,7 @@ public class RedisContainer extends Container { public RedisContainer() { super("redis:4.0.6", 6379, - (container) -> container.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(2))); + (container) -> container.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10))); } }