From 1d71cabef4dc8b80a3b4376375f402ddc991545b Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Tue, 17 Nov 2020 13:39:28 +0100 Subject: [PATCH] Fixed test that was failing due to TLS 1.3 backport to Java 8. Signed-off-by: Simone Bordet --- .../jetty/http2/alpn/tests/ALPNNegotiationTest.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/jetty-http2/http2-alpn-tests/src/test/java/org/eclipse/jetty/http2/alpn/tests/ALPNNegotiationTest.java b/jetty-http2/http2-alpn-tests/src/test/java/org/eclipse/jetty/http2/alpn/tests/ALPNNegotiationTest.java index 3409db04cdad..835e89c179da 100644 --- a/jetty-http2/http2-alpn-tests/src/test/java/org/eclipse/jetty/http2/alpn/tests/ALPNNegotiationTest.java +++ b/jetty-http2/http2-alpn-tests/src/test/java/org/eclipse/jetty/http2/alpn/tests/ALPNNegotiationTest.java @@ -164,8 +164,15 @@ public void selected(String s) encrypted.flip(); } assertEquals(21, encrypted.get()); + // TLS 1.3 may send 2 alerts: "user_canceled" followed by "close_notify". encrypted.clear(); - assertEquals(-1, channel.read(encrypted)); + read = channel.read(encrypted); + if (read > 0) + { + encrypted.clear(); + read = channel.read(encrypted); + } + assertEquals(-1, read); } }