andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix occasional failure in SocketConnectionAttemptTest

Browse Source 
- Use the real host name with a firewall so that the connection attempt always takes long time on all platforms.
- Fixes #2128
This commit is contained in:
Trustin Lee 2014-01-19 14:26:36 +09:00
parent 39b8cc348a
commit 2746688fd7
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketConnectionAttemptTest.java
View File

@ -21,6 +21,7 @@ import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter; import io.netty.channel.ChannelInboundHandlerAdapter;
import io.netty.channel.ChannelOption; import io.netty.channel.ChannelOption;
import io.netty.util.internal.SystemPropertyUtil; import io.netty.util.internal.SystemPropertyUtil;
import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.logging.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
import org.junit.Test; import org.junit.Test;
@ -35,11 +36,13 @@ import static org.junit.Assume.*;
public class SocketConnectionAttemptTest extends AbstractClientSocketTest { public class SocketConnectionAttemptTest extends AbstractClientSocketTest {
private static final String BAD_HOST = SystemPropertyUtil.get("io.netty.testsuite.badHost", "255.255.255.0"); private static final String BAD_HOST = SystemPropertyUtil.get("io.netty.testsuite.badHost", "netty.io");
private static final int BAD_PORT = SystemPropertyUtil.getInt("io.netty.testsuite.badPort", 65535);
static { static {
InternalLoggerFactory.getInstance(SocketConnectionAttemptTest.class).debug( InternalLogger logger = InternalLoggerFactory.getInstance(SocketConnectionAttemptTest.class);
"-Dio.netty.testsuite.badHost: {}", BAD_HOST); logger.debug("-Dio.netty.testsuite.badHost: {}", BAD_HOST);
logger.debug("-Dio.netty.testsuite.badPort: {}", BAD_PORT);
} }
@Test(timeout = 30000) @Test(timeout = 30000)
@ -49,7 +52,7 @@ public class SocketConnectionAttemptTest extends AbstractClientSocketTest {
public void testConnectTimeout(Bootstrap cb) throws Throwable { public void testConnectTimeout(Bootstrap cb) throws Throwable {
cb.handler(new TestHandler()).option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 2000); cb.handler(new TestHandler()).option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 2000);
ChannelFuture future = cb.connect(BAD_HOST, 8080); ChannelFuture future = cb.connect(BAD_HOST, BAD_PORT);
try { try {
assertThat(future.await(3000), is(true)); assertThat(future.await(3000), is(true));
} finally { } finally {
@ -64,7 +67,7 @@ public class SocketConnectionAttemptTest extends AbstractClientSocketTest {
boolean badHostTimedOut = true; boolean badHostTimedOut = true;
Socket socket = new Socket(); Socket socket = new Socket();
try { try {
socket.connect(new InetSocketAddress(BAD_HOST, 8080), 10); socket.connect(new InetSocketAddress(BAD_HOST, BAD_PORT), 10);
} catch (ConnectException e) { } catch (ConnectException e) {
badHostTimedOut = false; badHostTimedOut = false;
// is thrown for no route to host when using Socket connect // is thrown for no route to host when using Socket connect
@ -85,7 +88,7 @@ public class SocketConnectionAttemptTest extends AbstractClientSocketTest {
public void testConnectCancellation(Bootstrap cb) throws Throwable { public void testConnectCancellation(Bootstrap cb) throws Throwable {
cb.handler(new TestHandler()).option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 4000); cb.handler(new TestHandler()).option(ChannelOption.CONNECT_TIMEOUT_MILLIS, 4000);
ChannelFuture future = cb.connect(BAD_HOST, 8080); ChannelFuture future = cb.connect(BAD_HOST, BAD_PORT);
try { try {
if (future.await(1000)) { if (future.await(1000)) {
if (future.isSuccess()) { if (future.isSuccess()) {