root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Wait for neo4j to start accepting connections 

See gh-10516
This commit is contained in:
Madhura Bhave 2018-01-04 14:26:34 -08:00
parent 8001c6a2b8
commit fc3b43e832
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,6 +16,8 @@
package org.springframework.boot.test.autoconfigure.data.neo4j; package org.springframework.boot.test.autoconfigure.data.neo4j;
import java.util.concurrent.Callable;
import java.util.concurrent.TimeUnit;
import java.util.function.Supplier; import java.util.function.Supplier;
import org.junit.ClassRule; import org.junit.ClassRule;
@ -23,7 +25,11 @@ import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.rules.ExpectedException; import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.neo4j.ogm.config.Configuration;
import org.neo4j.ogm.session.Session; import org.neo4j.ogm.session.Session;
import org.neo4j.ogm.session.SessionFactory;
import org.rnorth.ducttape.TimeoutException;
import org.rnorth.ducttape.unreliables.Unreliables;
import org.testcontainers.containers.FixedHostPortGenericContainer; import org.testcontainers.containers.FixedHostPortGenericContainer;
import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.wait.HostPortWaitStrategy; import org.testcontainers.containers.wait.HostPortWaitStrategy;
@ -49,7 +55,7 @@ public class DataNeo4jTestIntegrationTests {
@ClassRule @ClassRule
public static DockerTestContainer<GenericContainer> genericContainer = new DockerTestContainer<>((Supplier<GenericContainer>) () -> new FixedHostPortGenericContainer("neo4j:latest") public static DockerTestContainer<GenericContainer> genericContainer = new DockerTestContainer<>((Supplier<GenericContainer>) () -> new FixedHostPortGenericContainer("neo4j:latest")
.withFixedExposedPort(7687, 7687) .withFixedExposedPort(7687, 7687)
.waitingFor(new AdditionalSleepWaitStrategy()).withEnv("NEO4J_AUTH", "none")); .waitingFor(new ConnectionVerifyingWaitStrategy()).withEnv("NEO4J_AUTH", "none"));
@Rule @Rule
@ -80,18 +86,35 @@ public class DataNeo4jTestIntegrationTests {
this.applicationContext.getBean(ExampleService.class); this.applicationContext.getBean(ExampleService.class);
} }
static class AdditionalSleepWaitStrategy extends HostPortWaitStrategy { static class ConnectionVerifyingWaitStrategy extends HostPortWaitStrategy {
@Override @Override
protected void waitUntilReady() { protected void waitUntilReady() {
super.waitUntilReady(); super.waitUntilReady();
Configuration configuration = new Configuration.Builder()
.uri("bolt://localhost:7687").build();
SessionFactory sessionFactory = new SessionFactory(configuration,
"org.springframework.boot.test.autoconfigure.data.neo4j");
try { try {
Thread.sleep(5000); Unreliables.retryUntilTrue((int) startupTimeout.getSeconds(), TimeUnit.SECONDS,
checkConnection(sessionFactory));
} }
catch (InterruptedException e) { catch (TimeoutException e) {
Thread.currentThread().interrupt(); throw new IllegalStateException();
} }
} }
private Callable<Boolean> checkConnection(SessionFactory sessionFactory) {
return () -> {
try {
sessionFactory.openSession().beginTransaction().close();
return true;
}
catch (Exception ex) {
return false;
}
};
}
} }
} }

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

@ -44,7 +44,7 @@ public class DataNeo4jTestWithIncludeFilterIntegrationTests {
@ClassRule @ClassRule
public static DockerTestContainer<GenericContainer> genericContainer = new DockerTestContainer<>((Supplier<GenericContainer>) () -> new FixedHostPortGenericContainer("neo4j:latest") public static DockerTestContainer<GenericContainer> genericContainer = new DockerTestContainer<>((Supplier<GenericContainer>) () -> new FixedHostPortGenericContainer("neo4j:latest")
.withFixedExposedPort(7687, 7687) .withFixedExposedPort(7687, 7687)
.waitingFor(new DataNeo4jTestIntegrationTests.AdditionalSleepWaitStrategy()).withEnv("NEO4J_AUTH", "none")); .waitingFor(new DataNeo4jTestIntegrationTests.ConnectionVerifyingWaitStrategy()).withEnv("NEO4J_AUTH", "none"));
@Autowired @Autowired
private ExampleService service; private ExampleService service;