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

Protect autoconfigure module against slow starting test containers

This commit is contained in:
Andy Wilkinson 2019-09-04 10:15:10 +01:00
parent 7f62c5a283
commit 29080b87ec
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,8 @@
package org.springframework.boot.autoconfigure.data.cassandra;
import java.time.Duration;
import com.datastax.driver.core.Cluster;
import com.datastax.driver.core.Session;
import org.junit.After;
@ -45,7 +47,7 @@ public class CassandraDataAutoConfigurationIntegrationTests {
@ClassRule
public static SkippableContainer<CassandraContainer<?>> cassandra = new SkippableContainer<>(
CassandraContainer::new);
() -> new CassandraContainer<>().withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(2)));
private AnnotationConfigApplicationContext context;

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

@ -16,6 +16,8 @@
package org.springframework.boot.testsupport.testcontainers;
import java.time.Duration;
import org.testcontainers.containers.GenericContainer;
/**
@ -28,7 +30,8 @@ import org.testcontainers.containers.GenericContainer;
public class RedisContainer extends Container {
public RedisContainer() {
super("redis:4.0.6", 6379);
super("redis:4.0.6", 6379,
(container) -> container.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(2)));
}
}