diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-05-25 14:58:44 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-05-25 17:40:25 +0200 |
commit | 64c6567d9e52fbaec5b7f0363b8b4680cf144cf5 (patch) | |
tree | b7f5f3e1f6a4f314646faad4c8421124306614ce /container-core/src | |
parent | 8e3d515ff5c5c58ce6e7ae16ac386f9e4655494c (diff) |
Don't create test driver twice
Diffstat (limited to 'container-core/src')
-rw-r--r-- | container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java | 5 |
1 files changed, 2 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 5056cf91d79..eb303ba831a 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 @@ -523,7 +523,7 @@ public class HttpServerTest { MetricConsumerMock metricConsumer = new MetricConsumerMock(); InMemoryConnectionLog connectionLog = new InMemoryConnectionLog(); JettyTestDriver driver = createSslTestDriver(certificateFile, privateKeyFile, metricConsumer, connectionLog); - try (CloseableHttpAsyncClient client = createHttp2Client(certificateFile, privateKeyFile)) { + try (CloseableHttpAsyncClient client = createHttp2Client(driver)) { String uri = "https://localhost:" + driver.server().getListenPort() + "/status.html"; SimpleHttpResponse response = client.execute(SimpleHttpRequests.get(uri), null).get(); assertNull(response.getBodyText()); @@ -967,8 +967,7 @@ public class HttpServerTest { return client; } - private static CloseableHttpAsyncClient createHttp2Client(Path certificateFile, Path privateKeyFile) { - JettyTestDriver driver = JettyTestDriver.newInstanceWithSsl(new EchoRequestHandler(), certificateFile, privateKeyFile, TlsClientAuth.WANT); + private static CloseableHttpAsyncClient createHttp2Client(JettyTestDriver driver) { TlsStrategy tlsStrategy = ClientTlsStrategyBuilder.create() .setSslContext(driver.sslContext()) .build(); |