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

Attempt to prevent BindExceptions in tests 

Update tests that use `doWithBlockedPort` so that the port is obtained
and bound early to ensure that something else doesn't grab it.
This commit is contained in:
Phillip Webb 2016-04-12 12:54:57 -07:00
parent 22e1a23d38
commit fa18d2ccbf
2 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
View File

@ -763,18 +763,14 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
public void portClashOfPrimaryConnectorResultsInPortInUseException()
throws IOException {
AbstractEmbeddedServletContainerFactory factory = getFactory();
final int port = SocketUtils.findAvailableTcpPort(40000);
factory.setPort(port);
this.container = factory.getEmbeddedServletContainer();
doWithBlockedPort(port, new Runnable() {
doWithBlockedPort(new BlockedPortAction() {
@Override
public void run() {
public void run(int port) {
try {
factory.setPort(port);
AbstractEmbeddedServletContainerFactoryTests.this.container = factory
.getEmbeddedServletContainer();
AbstractEmbeddedServletContainerFactoryTests.this.container.start();
fail();
}
@ -784,25 +780,21 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
}
});
}
@Test
public void portClashOfSecondaryConnectorResultsInPortInUseException()
throws IOException {
AbstractEmbeddedServletContainerFactory factory = getFactory();
factory.setPort(SocketUtils.findAvailableTcpPort(40000));
final int port = SocketUtils.findAvailableTcpPort(40000);
addConnector(port, factory);
this.container = factory.getEmbeddedServletContainer();
doWithBlockedPort(port, new Runnable() {
doWithBlockedPort(new BlockedPortAction() {
@Override
public void run() {
public void run(int port) {
try {
AbstractEmbeddedServletContainerFactory factory = getFactory();
factory.setPort(SocketUtils.findAvailableTcpPort(40000));
addConnector(port, factory);
AbstractEmbeddedServletContainerFactoryTests.this.container = factory
.getEmbeddedServletContainer();
AbstractEmbeddedServletContainerFactoryTests.this.container.start();
fail();
}
@ -998,12 +990,19 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
return bean;
}
protected final void doWithBlockedPort(final int port, Runnable action)
throws IOException {
protected final void doWithBlockedPort(BlockedPortAction action) throws IOException {
int port = SocketUtils.findAvailableTcpPort(40000);
ServerSocket serverSocket = new ServerSocket();
serverSocket.bind(new InetSocketAddress(port));
for (int i = 0; i < 10; i++) {
try {
serverSocket.bind(new InetSocketAddress(port));
break;
}
catch (Exception ex) {
}
}
try {
action.run();
action.run(port);
}
finally {
serverSocket.close();
@ -1051,4 +1050,10 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
};
public interface BlockedPortAction {
void run(int port);
}
}

7
spring-boot/src/test/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java
View File

@ -316,12 +316,10 @@ public class TomcatEmbeddedServletContainerFactoryTests
@Test
public void primaryConnectorPortClashThrowsIllegalStateException()
throws InterruptedException, IOException {
final int port = SocketUtils.findAvailableTcpPort(40000);
doWithBlockedPort(port, new Runnable() {
doWithBlockedPort(new BlockedPortAction() {
@Override
public void run() {
public void run(int port) {
TomcatEmbeddedServletContainerFactory factory = getFactory();
factory.setPort(port);
@ -337,7 +335,6 @@ public class TomcatEmbeddedServletContainerFactoryTests
}
});
}
@Test