From 2387d973ec4db6baa48cc0f2f7f4bd587c6acf0d Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Thu, 14 Jul 2016 12:41:08 +0200 Subject: [PATCH] Made test more robust on slower machines. --- .../eclipse/jetty/http2/client/IdleTimeoutTest.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/IdleTimeoutTest.java b/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/IdleTimeoutTest.java index 7be2d788546..b0c4f96cec4 100644 --- a/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/IdleTimeoutTest.java +++ b/jetty-http2/http2-client/src/test/java/org/eclipse/jetty/http2/client/IdleTimeoutTest.java @@ -528,6 +528,7 @@ public class IdleTimeoutTest extends AbstractTest @Test public void testBufferedReadsResetStreamIdleTimeout() throws Exception { + int bufferSize = 8192; long delay = 1000; start(new HttpServlet() { @@ -535,7 +536,7 @@ public class IdleTimeoutTest extends AbstractTest protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { ServletInputStream input = request.getInputStream(); - byte[] buffer = new byte[8192]; + byte[] buffer = new byte[bufferSize]; while (true) { int read = input.read(buffer); @@ -566,12 +567,13 @@ public class IdleTimeoutTest extends AbstractTest // Send data larger than the flow control window. // The client will send bytes up to the flow control window immediately - // and they will be buffered by the server, which will read them slowly. - // Server reads should reset the idle timeout. - ByteBuffer data = ByteBuffer.allocate(FlowControlStrategy.DEFAULT_WINDOW_SIZE + 1); + // and they will be buffered by the server; the Servlet will consume them slowly. + // Servlet reads should reset the idle timeout. + int contentLength = FlowControlStrategy.DEFAULT_WINDOW_SIZE + 1; + ByteBuffer data = ByteBuffer.allocate(contentLength); stream.data(new DataFrame(stream.getId(), data, true), Callback.NOOP); - Assert.assertTrue(latch.await(555, TimeUnit.SECONDS)); + Assert.assertTrue(latch.await(2 * (contentLength / bufferSize + 1) * delay, TimeUnit.MILLISECONDS)); } private void sleep(long value)