From c15e79cca4087c848e19356f2267d9e75b96ec4d Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Fri, 26 Mar 2021 10:18:36 +0100 Subject: Close jetty after reading access log --- .../test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java index 46e65ecb3fa..d8e94d13813 100644 --- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java +++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java @@ -189,7 +189,7 @@ public class HttpServerTest { binder -> binder.bind(RequestLog.class).toInstance(requestLogMock)); driver.client().get("/status.html") .expectStatusCode(is(REQUEST_URI_TOO_LONG)); - RequestLogEntry entry = requestLogMock.poll(Duration.ofSeconds(30)); + RequestLogEntry entry = requestLogMock.poll(Duration.ofSeconds(5)); assertEquals(414, entry.statusCode().getAsInt()); assertThat(driver.close(), is(true)); } @@ -876,10 +876,10 @@ public class HttpServerTest { new ConnectorConfig.Builder(), binder -> binder.bind(RequestLog.class).toInstance(requestLogMock)); driver.client().newPost("/status.html").setContent("abcdef").execute().expectStatusCode(is(OK)); - assertThat(driver.close(), is(true)); - RequestLogEntry entry = requestLogMock.poll(Duration.ofSeconds(30)); + RequestLogEntry entry = requestLogMock.poll(Duration.ofSeconds(5)); Assertions.assertThat(entry.statusCode()).hasValue(200); Assertions.assertThat(entry.requestSize()).hasValue(6); + assertThat(driver.close(), is(true)); } private ContentResponse sendJettyClientRequest(TestDriver testDriver, Path certificateFile, Object tag) -- cgit v1.2.3