aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2021-03-26 10:18:36 +0100
committerJon Marius Venstad <venstad@gmail.com>2021-03-26 10:18:36 +0100
commitc15e79cca4087c848e19356f2267d9e75b96ec4d (patch)
tree58e5f64d64eaa63a1e7bdc301bead07d2aabf51e
parent2a4062de90d3f196125132a214fa14021755c916 (diff)
Close jetty after reading access log
-rw-r--r--container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java6
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)