Skip to content

Commit 0fb4825

Browse files
committed
Harmonize Neo4jContainer startup options
Closes gh-26084
1 parent 1de2dd9 commit 0fb4825

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2021 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@ class DataNeo4jTestIntegrationTests {
4747

4848
@Container
4949
static final Neo4jContainer<?> neo4j = new Neo4jContainer<>(DockerImageNames.neo4j()).withoutAuthentication()
50-
.withStartupTimeout(Duration.ofMinutes(10));
50+
.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10));
5151

5252
@Autowired
5353
private Session session;

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestPropertiesIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2021 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@ class DataNeo4jTestPropertiesIntegrationTests {
4343

4444
@Container
4545
static final Neo4jContainer<?> neo4j = new Neo4jContainer<>(DockerImageNames.neo4j()).withoutAuthentication()
46-
.withStartupTimeout(Duration.ofMinutes(10));
46+
.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10));
4747

4848
@Autowired
4949
private Environment environment;

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/data/neo4j/DataNeo4jTestWithIncludeFilterIntegrationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2020 the original author or authors.
2+
* Copyright 2012-2021 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ class DataNeo4jTestWithIncludeFilterIntegrationTests {
4444

4545
@Container
4646
static final Neo4jContainer<?> neo4j = new Neo4jContainer<>(DockerImageNames.neo4j()).withoutAuthentication()
47-
.withStartupTimeout(Duration.ofMinutes(10));
47+
.withStartupAttempts(5).withStartupTimeout(Duration.ofMinutes(10));
4848

4949
@Autowired
5050
private ExampleService service;

0 commit comments

Comments
 (0)