aboutsummaryrefslogtreecommitdiffstats
path: root/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2021-01-15 18:51:38 +0100
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2021-01-15 19:15:38 +0100
commit01898a51e39a6c0b71bd571ae0968e967c0bcc67 (patch)
tree58b43501dd34f0fd9338828eb5d2fbe81225dec3 /jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server
parent623c5906f15ffb07048f7326809c7de4dc0c8d8f (diff)
Rewrite JettyConnectionLogger to deduplicate Jetty connections
Use SocketChannelEndPoint to uniquely identity TCP/IP connections. Rename 'AggregatedConnectionInfo' to 'ConnectionInfo'. Implement SslHandshakeListener to read SSL session after handshake.
Diffstat (limited to 'jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server')
-rw-r--r--jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java2
1 files changed, 1 insertions, 1 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 4a18c1e50c9..ef6d160f729 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
@@ -820,7 +820,7 @@ public class HttpServerTest {
TestDriver driver = TestDrivers.newInstanceWithSsl(new EchoRequestHandler(), certificateFile, privateKeyFile, TlsClientAuth.NEED, overrideModule);
driver.client().get("/status.html");
assertTrue(driver.close());
- Assertions.assertThat(connectionLog.logEntries()).hasSize(2); // For http connection upgraded to https
+ Assertions.assertThat(connectionLog.logEntries()).hasSize(1); // TODO Assert on content
}
private ContentResponse sendJettyClientRequest(TestDriver testDriver, HttpClient client, Object tag)