Skip to content

Commit 29080b8

Browse files
committed
Protect autoconfigure module against slow starting test containers
1 parent 7f62c5a commit 29080b8

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package org.springframework.boot.autoconfigure.data.cassandra;
1818

19+
import java.time.Duration;
20+
1921
import com.datastax.driver.core.Cluster;
2022
import com.datastax.driver.core.Session;
2123
import org.junit.After;
@@ -45,7 +47,7 @@ public class CassandraDataAutoConfigurationIntegrationTests {
4547

4648
@ClassRule
4749
public static SkippableContainer<CassandraContainer<?>> cassandra = new SkippableContainer<>(
48-
CassandraContainer::new);
50+
() -> new CassandraContainer<>().withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(2)));
4951

5052
private AnnotationConfigApplicationContext context;
5153

spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/RedisContainer.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package org.springframework.boot.testsupport.testcontainers;
1818

19+
import java.time.Duration;
20+
1921
import org.testcontainers.containers.GenericContainer;
2022

2123
/**
@@ -28,7 +30,8 @@
2830
public class RedisContainer extends Container {
2931

3032
public RedisContainer() {
31-
super("redis:4.0.6", 6379);
33+
super("redis:4.0.6", 6379,
34+
(container) -> container.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(2)));
3235
}
3336

3437
}

0 commit comments

Comments
 (0)