diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-03-09 15:39:11 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-03-09 15:39:11 +0100 |
commit | abd60bcea6af66729cad8a0cfc03d404b8b91e0a (patch) | |
tree | 06b32f6e9e322f827dd171cfbb4474815973dcfa /jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java | |
parent | f702d88c1e3ad22c95043b91ed4d7097c7700c77 (diff) |
Close server before inspecting access log
Diffstat (limited to 'jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java')
-rw-r--r-- | jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java index 90bc34d0042..5df64c02990 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java @@ -678,11 +678,12 @@ public class HttpServerTest { int proxiedRemotePort = 12345; sendJettyClientRequest(driver, client, new V1.Tag(proxiedRemoteAddress, proxiedRemotePort)); sendJettyClientRequest(driver, client, new V2.Tag(proxiedRemoteAddress, proxiedRemotePort)); + client.stop(); + assertThat(driver.close(), is(true)); + assertThat(accessLogMock.logEntries, hasSize(2)); assertLogEntryHasRemote(accessLogMock.logEntries.get(0), proxiedRemoteAddress, proxiedRemotePort); assertLogEntryHasRemote(accessLogMock.logEntries.get(1), proxiedRemoteAddress, proxiedRemotePort); - client.stop(); - assertThat(driver.close(), is(true)); } @Test @@ -694,17 +695,15 @@ public class HttpServerTest { TestDriver driver = createSslWithProxyProtocolTestDriver(certificateFile, privateKeyFile, accessLogMock, /*mixedMode*/true); HttpClient client = createJettyHttpClient(certificateFile); - sendJettyClientRequest(driver, client, null); - assertThat(accessLogMock.logEntries, hasSize(1)); - assertLogEntryHasRemote(accessLogMock.logEntries.get(0), "127.0.0.1", 0); - String proxiedRemoteAddress = "192.168.0.100"; + sendJettyClientRequest(driver, client, null); sendJettyClientRequest(driver, client, new V2.Tag(proxiedRemoteAddress, 12345)); - assertThat(accessLogMock.logEntries, hasSize(2)); - assertLogEntryHasRemote(accessLogMock.logEntries.get(1), proxiedRemoteAddress, 0); - client.stop(); assertThat(driver.close(), is(true)); + + assertThat(accessLogMock.logEntries, hasSize(2)); + assertLogEntryHasRemote(accessLogMock.logEntries.get(0), "127.0.0.1", 0); + assertLogEntryHasRemote(accessLogMock.logEntries.get(1), proxiedRemoteAddress, 0); } private void sendJettyClientRequest(TestDriver testDriver, HttpClient client, Object tag) |