Skip to content

S
spring-boot
Commit 80685f81 authored by Phillip Webb's avatar Phillip Webb
Browse files
Options

Merge branch '2.0.x'

parents 5e50f762 744cdf43
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/DevToolsIntegrationTests.java
View file @ 80685f81
...@@ -80,9 +80,7 @@ public class DevToolsIntegrationTests { ...@@ -80,9 +80,7 @@ public class DevToolsIntegrationTests {
@After @After
public void stopApplication() throws InterruptedException { public void stopApplication() throws InterruptedException {
if (this.launchedApplication != null) { this.launchedApplication.stop();
this.launchedApplication.stop();
}
} }
@Test @Test
......
spring-boot-tests/spring-boot-integration-tests/spring-boot-devtools-tests/src/test/java/org/springframework/boot/devtools/tests/RemoteApplicationLauncher.java
View file @ 80685f81
...@@ -40,12 +40,12 @@ abstract class RemoteApplicationLauncher implements ApplicationLauncher { ...@@ -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=0", "--spring.devtools.remote.secret=secret"); "--server.port=12345", "--spring.devtools.remote.secret=secret");
int port = awaitServerPort(applicationJvm.getStandardOut()); 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:" + port); "--spring.devtools.remote.secret=secret", "http://localhost:12345");
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(),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment