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

Use random port for DevTools tests 

Change the `RemoteApplicationLauncher` to use a random port and also
protect against an NPE if the launch fails.
This commit is contained in:
Phillip Webb 2018-10-29 17:42:47 -07:00
parent 9ea5c58e38
commit 4630c2292f
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/DevToolsIntegrationTests.java
View File

@ -80,7 +80,9 @@ public class DevToolsIntegrationTests {
@After @After
public void stopApplication() throws InterruptedException { public void stopApplication() throws InterruptedException {
this.launchedApplication.stop(); if (this.launchedApplication != null) {
this.launchedApplication.stop();
}
} }
@Test @Test

6
spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/RemoteApplicationLauncher.java
View File

@ -40,12 +40,12 @@ abstract class RemoteApplicationLauncher implements ApplicationLauncher {
throws Exception { throws Exception {
LaunchedJvm applicationJvm = javaLauncher.launch("app", LaunchedJvm applicationJvm = javaLauncher.launch("app",
createApplicationClassPath(), "com.example.DevToolsTestApplication", createApplicationClassPath(), "com.example.DevToolsTestApplication",
"--server.port=12345", "--spring.devtools.remote.secret=secret"); "--server.port=0", "--spring.devtools.remote.secret=secret");
awaitServerPort(applicationJvm.getStandardOut()); int port = awaitServerPort(applicationJvm.getStandardOut());
LaunchedJvm remoteSpringApplicationJvm = javaLauncher.launch( LaunchedJvm remoteSpringApplicationJvm = javaLauncher.launch(
"remote-spring-application", createRemoteSpringApplicationClassPath(), "remote-spring-application", createRemoteSpringApplicationClassPath(),
RemoteSpringApplication.class.getName(), RemoteSpringApplication.class.getName(),
"--spring.devtools.remote.secret=secret", "http://localhost:12345"); "--spring.devtools.remote.secret=secret", "http://localhost:" + port);
awaitRemoteSpringApplication(remoteSpringApplicationJvm.getStandardOut()); awaitRemoteSpringApplication(remoteSpringApplicationJvm.getStandardOut());
return new LaunchedApplication(new File("target/remote"), return new LaunchedApplication(new File("target/remote"),
applicationJvm.getStandardOut(), applicationJvm.getStandardError(), applicationJvm.getStandardOut(), applicationJvm.getStandardError(),