aboutsummaryrefslogtreecommitdiffstats
path: root/container-core/src/test/java/com/yahoo
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahooinc.com>2023-03-24 13:02:36 +0100
committerBjørn Christian Seime <bjorncs@yahooinc.com>2023-03-24 13:02:36 +0100
commit2a8d0f7f1ec24ce2e4c34e572bba427748a0768c (patch)
tree9c736a4f34310da59c483c818a01c9f74da34f0a /container-core/src/test/java/com/yahoo
parent03b367f30400866dc569873e6ede020cbcdf1bf9 (diff)
'Connection reset' is a valid signal for failed handshake
Diffstat (limited to 'container-core/src/test/java/com/yahoo')
-rw-r--r--container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/SslHandshakeMetricsTest.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/SslHandshakeMetricsTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/SslHandshakeMetricsTest.java
index 677fb2dbf6d..99fa9bb2052 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/SslHandshakeMetricsTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/SslHandshakeMetricsTest.java
@@ -172,9 +172,11 @@ class SslHandshakeMetricsTest {
assertThat(e.getMessage()).contains(expectedExceptionSubstring);
} catch (SocketException | SSLException e) {
// 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);
+ var msg = e.getMessage();
+ log.log(Level.WARNING, "Client failed to get a proper TLS handshake response: " + msg, e);
// Only ignore a subset of exceptions
- assertTrue(e.getMessage().contains("readHandshakeRecord") || e.getMessage().contains("Broken pipe"), e.getMessage());
+ assertTrue(msg.contains("readHandshakeRecord") || msg.contains("Broken pipe") || msg.contains("Connection reset"),
+ e.toString());
}
}