Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes #1244 - ProxyServletFailureTest.testProxyRequestStallsContentServerIdlesTimeout() has TimeoutException visible.

This commit is contained in:
Simone Bordet 2017-01-17 10:25:50 +01:00
parent 4c8441a0df
commit 80c4be4ea3
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletFailureTest.java
View File

@ -49,7 +49,6 @@ import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHandler;
import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.toolchain.test.TestTracker; import org.eclipse.jetty.toolchain.test.TestTracker;
import org.eclipse.jetty.toolchain.test.http.SimpleHttpParser; import org.eclipse.jetty.toolchain.test.http.SimpleHttpParser;
@ -94,7 +93,7 @@ public class ProxyServletFailureTest
private void prepareProxy() throws Exception private void prepareProxy() throws Exception
{ {
prepareProxy(new HashMap<String, String>()); prepareProxy(new HashMap<>());
} }
private void prepareProxy(Map<String, String> initParams) throws Exception private void prepareProxy(Map<String, String> initParams) throws Exception
@ -258,7 +257,7 @@ public class ProxyServletFailureTest
public void testProxyRequestStallsContentServerIdlesTimeout() throws Exception public void testProxyRequestStallsContentServerIdlesTimeout() throws Exception
{ {
final byte[] content = new byte[]{'C', '0', 'F', 'F', 'E', 'E'}; final byte[] content = new byte[]{'C', '0', 'F', 'F', 'E', 'E'};
int expected = -1; int expected;
if (proxyServlet instanceof AsyncProxyServlet) if (proxyServlet instanceof AsyncProxyServlet)
{ {
// TODO should this be a 502 also??? // TODO should this be a 502 also???
@ -309,7 +308,7 @@ public class ProxyServletFailureTest
long idleTimeout = 1000; long idleTimeout = 1000;
serverConnector.setIdleTimeout(idleTimeout); serverConnector.setIdleTimeout(idleTimeout);
try(StacklessLogging stackless = new StacklessLogging(ServletHandler.class)) try(StacklessLogging stackless = new StacklessLogging(HttpChannel.class))
{ {
ContentResponse response = client.newRequest("localhost", serverConnector.getLocalPort()) ContentResponse response = client.newRequest("localhost", serverConnector.getLocalPort())
.content(new BytesContentProvider(content)) .content(new BytesContentProvider(content))