summaryrefslogtreecommitdiffstats
path: root/jdisc_http_service
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2020-03-05 11:38:31 +0100
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2020-03-05 11:38:31 +0100
commit8771cd10a37eb9960294b55322159b988dbf08e7 (patch)
tree8e0a1b2dab7765364b477c31b677c153da81ce97 /jdisc_http_service
parent3c6b797693abd6c4a69688d1c9948c3506038127 (diff)
Use TLSv1.3 in test instead of TLSv1.1
TLSv1.1 seems to be disabled in JDK distribution on internal CI platform.
Diffstat (limited to 'jdisc_http_service')
-rw-r--r--jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java4
1 files changed, 2 insertions, 2 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 7ecf1b00fc1..a5bd0164e25 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
@@ -605,7 +605,7 @@ public class HttpServerTest {
.build();
assertHttpsRequestTriggersSslHandshakeException(
- driver, clientCtx, "TLSv1.1", null, "Received fatal alert: protocol_version");
+ driver, clientCtx, "TLSv1.3", null, "Received fatal alert: protocol_version");
verify(metricConsumer.mockitoMock())
.add(Metrics.SSL_HANDSHAKE_FAILURE_INCOMPATIBLE_PROTOCOLS, 1L, MetricConsumerMock.STATIC_CONTEXT);
assertThat(driver.close(), is(true));
@@ -675,7 +675,7 @@ public class HttpServerTest {
} catch (SSLHandshakeException e) {
assertThat(e.getMessage(), containsString(expectedExceptionSubstring));
} catch (SSLException e) {
- // Jetty may sometime close the connection before the apache client has fully consumed the TLS handshake frame
+ // This exception is thrown if Apache httpclient's write thread detects the handshake failure before the read thread.
log.log(Level.WARNING, "Client failed to get a proper TLS handshake response: " + e.getMessage(), e);
assertThat(e.getMessage(), containsString("readHandshakeRecord")); // Only ignore this specific ssl exception
}