diff --git a/src/test/java/org/jboss/netty/channel/socket/NioClientSocketShutdownTimeTest.java b/src/test/java/org/jboss/netty/channel/socket/NioClientSocketShutdownTimeTest.java index 6af92bfa17..43dde64aa0 100644 --- a/src/test/java/org/jboss/netty/channel/socket/NioClientSocketShutdownTimeTest.java +++ b/src/test/java/org/jboss/netty/channel/socket/NioClientSocketShutdownTimeTest.java @@ -41,10 +41,6 @@ public class NioClientSocketShutdownTimeTest { @Test public void testShutdownTime() throws Throwable { - if (!TestUtil.isTimingTestEnabled()) { - return; - } - ServerSocketChannel serverSocket = ServerSocketChannel.open(); serverSocket.socket().bind(new InetSocketAddress(0)); diff --git a/src/test/java/org/jboss/netty/channel/socket/NioServerSocketShutdownTimeTest.java b/src/test/java/org/jboss/netty/channel/socket/NioServerSocketShutdownTimeTest.java index 0f032136b4..98fa271ded 100644 --- a/src/test/java/org/jboss/netty/channel/socket/NioServerSocketShutdownTimeTest.java +++ b/src/test/java/org/jboss/netty/channel/socket/NioServerSocketShutdownTimeTest.java @@ -44,10 +44,6 @@ public class NioServerSocketShutdownTimeTest { @Test(timeout = 10000) public void testSuccessfulBindAttempt() throws Exception { - if (!TestUtil.isTimingTestEnabled()) { - return; - } - ServerBootstrap bootstrap = new ServerBootstrap( new NioServerSocketChannelFactory( Executors.newCachedThreadPool(), diff --git a/src/test/java/org/jboss/netty/util/TestUtil.java b/src/test/java/org/jboss/netty/util/TestUtil.java index 86531f71e8..258ca04d89 100644 --- a/src/test/java/org/jboss/netty/util/TestUtil.java +++ b/src/test/java/org/jboss/netty/util/TestUtil.java @@ -18,8 +18,6 @@ package org.jboss.netty.util; import java.net.InetAddress; import java.net.UnknownHostException; -import org.jboss.netty.util.internal.ConversionUtil; - /** * @author The Netty Project (netty-dev@lists.jboss.org) @@ -29,20 +27,9 @@ import org.jboss.netty.util.internal.ConversionUtil; @org.junit.Ignore public final class TestUtil { - private static final boolean ENABLED; private static final InetAddress LOCALHOST; static { - String value = System.getProperty("exclude-timing-tests", "false").trim(); - if (value.length() == 0) { - value = "true"; - } - - ENABLED = !ConversionUtil.toBoolean(value); - if (!ENABLED) { - System.err.println("Timing tests will be disabled as requested."); - } - InetAddress localhost = null; try { localhost = InetAddress.getLocalHost(); @@ -62,10 +49,6 @@ public final class TestUtil { LOCALHOST = localhost; } - public static boolean isTimingTestEnabled() { - return ENABLED; - } - public static InetAddress getLocalHost() { // We cache this because some machine takes almost forever to return // from InetAddress.getLocalHost(). I think it's due to the incorrect