From 3c84ea9350e11883463c825ec5b9849461c64a42 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 5 Mar 2021 15:36:45 +0000 Subject: [PATCH] Try to stabilize tests that use Neo4jContainer Closes gh-25520 --- .../Neo4jRepositoriesAutoConfigurationIntegrationTests.java | 5 ++++- .../neo4j/Neo4jAutoConfigurationIntegrationTests.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfigurationIntegrationTests.java index 829b4a76503..40056326bc9 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfigurationIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfigurationIntegrationTests.java @@ -16,6 +16,8 @@ package org.springframework.boot.autoconfigure.data.neo4j; +import java.time.Duration; + import org.junit.jupiter.api.Test; import org.testcontainers.containers.Neo4jContainer; import org.testcontainers.junit.jupiter.Container; @@ -44,7 +46,8 @@ import static org.assertj.core.api.Assertions.assertThat; public class Neo4jRepositoriesAutoConfigurationIntegrationTests { @Container - private static final Neo4jContainer neo4jServer = new Neo4jContainer<>(DockerImageNames.neo4j()); + private static final Neo4jContainer neo4jServer = new Neo4jContainer<>(DockerImageNames.neo4j()) + .withStartupTimeout(Duration.ofMinutes(10)); @DynamicPropertySource static void neo4jProperties(DynamicPropertyRegistry registry) { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/neo4j/Neo4jAutoConfigurationIntegrationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/neo4j/Neo4jAutoConfigurationIntegrationTests.java index 1f1db814c48..a79b56c5df6 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/neo4j/Neo4jAutoConfigurationIntegrationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/neo4j/Neo4jAutoConfigurationIntegrationTests.java @@ -16,6 +16,8 @@ package org.springframework.boot.autoconfigure.neo4j; +import java.time.Duration; + import org.junit.jupiter.api.Test; import org.neo4j.driver.Driver; import org.neo4j.driver.Result; @@ -46,7 +48,8 @@ import static org.assertj.core.api.Assertions.assertThat; class Neo4jAutoConfigurationIntegrationTests { @Container - private static final Neo4jContainer neo4jServer = new Neo4jContainer<>(DockerImageNames.neo4j()); + private static final Neo4jContainer neo4jServer = new Neo4jContainer<>(DockerImageNames.neo4j()) + .withStartupTimeout(Duration.ofMinutes(10)); @DynamicPropertySource static void neo4jProperties(DynamicPropertyRegistry registry) {