Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoakim Erdfelt2014-05-29 18:42:50 +0000
committerJoakim Erdfelt2014-05-29 18:42:50 +0000
commit7b3fc2cecf5f9404fb95299066508c6d44029fdc (patch)
treecea9c265fbd39e89df5027281ce405928a089012 /jetty-websocket
parentf00cd9f6ec31ba8fed0152bedf9930de94e7ef8f (diff)
downloadorg.eclipse.jetty.project-7b3fc2cecf5f9404fb95299066508c6d44029fdc.tar.gz
org.eclipse.jetty.project-7b3fc2cecf5f9404fb95299066508c6d44029fdc.tar.xz
org.eclipse.jetty.project-7b3fc2cecf5f9404fb95299066508c6d44029fdc.zip
Enabling testcase, reducing logging level
Diffstat (limited to 'jetty-websocket')
-rw-r--r--jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/BadNetworkTest.java4
-rw-r--r--jetty-websocket/websocket-client/src/test/resources/jetty-logging.properties2
2 files changed, 2 insertions, 4 deletions
diff --git a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/BadNetworkTest.java b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/BadNetworkTest.java
index 19b740a7e1..102e76416a 100644
--- a/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/BadNetworkTest.java
+++ b/jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/BadNetworkTest.java
@@ -27,11 +27,10 @@ import org.eclipse.jetty.toolchain.test.TestTracker;
import org.eclipse.jetty.websocket.api.Session;
import org.eclipse.jetty.websocket.api.StatusCode;
import org.eclipse.jetty.websocket.common.test.BlockheadServer;
-import org.eclipse.jetty.websocket.common.test.LeakTrackingBufferPool;
import org.eclipse.jetty.websocket.common.test.BlockheadServer.ServerConnection;
+import org.eclipse.jetty.websocket.common.test.LeakTrackingBufferPool;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
@@ -104,7 +103,6 @@ public class BadNetworkTest
wsocket.assertCloseCode(StatusCode.NO_CLOSE);
}
- @Ignore("Idle timeout not working yet")
@Test
public void testAbruptServerClose() throws Exception
{
diff --git a/jetty-websocket/websocket-client/src/test/resources/jetty-logging.properties b/jetty-websocket/websocket-client/src/test/resources/jetty-logging.properties
index 826f50f1ca..9668b13105 100644
--- a/jetty-websocket/websocket-client/src/test/resources/jetty-logging.properties
+++ b/jetty-websocket/websocket-client/src/test/resources/jetty-logging.properties
@@ -7,7 +7,7 @@ org.eclipse.jetty.LEVEL=WARN
# org.eclipse.jetty.io.FillInterest.LEVEL=DEBUG
# org.eclipse.jetty.io.AbstractConnection.LEVEL=DEBUG
# org.eclipse.jetty.websocket.LEVEL=WARN
-org.eclipse.jetty.websocket.LEVEL=DEBUG
+# org.eclipse.jetty.websocket.LEVEL=DEBUG
# org.eclipse.jetty.websocket.client.LEVEL=DEBUG
# org.eclipse.jetty.websocket.common.io.AbstractWebSocketConnection.LEVEL=DEBUG
# org.eclipse.jetty.websocket.common.io.IOState.LEVEL=DEBUG

Back to the top