Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-09-03 04:26:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix race condition in LiveReloadServerTests.clientClose

Browse Source
This commit is contained in:
Andy Wilkinson 2015-10-07 13:39:59 +01:00
parent 500eeb6a70
commit b7ecccf0a3
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
spring-boot-devtools/src/test/java/org/springframework/boot/devtools/livereload/LiveReloadServerTests.java
View File

@ -48,6 +48,7 @@ import static org.junit.Assert.assertThat;
* Tests for {@link LiveReloadServer}.
*
* @author Phillip Webb
* @author Andy Wilkinson
*/
public class LiveReloadServerTests {
@ -122,9 +123,18 @@ public class LiveReloadServerTests {
finally {
client.stop();
}
awaitClosedException();
assertThat(this.server.getClosedExceptions().size(), greaterThan(0));
}
private void awaitClosedException() throws InterruptedException {
long startTime = System.currentTimeMillis();
while (this.server.getClosedExceptions().isEmpty()
&& System.currentTimeMillis() - startTime > 10000) {
Thread.sleep(100);
}
}
@Test
public void serverClose() throws Exception {
WebSocketClient client = new WebSocketClient();
@ -221,7 +231,9 @@ public class LiveReloadServerTests {
*/
private static class MonitoredLiveReloadServer extends LiveReloadServer {
private List<ConnectionClosedException> closedExceptions = new ArrayList<ConnectionClosedException>();
private final List<ConnectionClosedException> closedExceptions = new ArrayList<ConnectionClosedException>();
private final Object monitor = new Object();
MonitoredLiveReloadServer(int port) {
super(port);
@ -234,7 +246,9 @@ public class LiveReloadServerTests {
}
public List<ConnectionClosedException> getClosedExceptions() {
return this.closedExceptions;
synchronized (this.monitor) {
return new ArrayList<ConnectionClosedException>(this.closedExceptions);
}
}
private class MonitoredConnection extends Connection {
@ -250,7 +264,9 @@ public class LiveReloadServerTests {
super.run();
}
catch (ConnectionClosedException ex) {
MonitoredLiveReloadServer.this.closedExceptions.add(ex);
synchronized (MonitoredLiveReloadServer.this.monitor) {
MonitoredLiveReloadServer.this.closedExceptions.add(ex);
}
throw ex;
}
}