Merge pull request #17196 from vespa-engine/jonmv/read-before-closing-log

Close jetty after reading access log

1 files 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)