From cc5fea5c3afd8c552664f6086b7321ed249f6e4f Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Fri, 6 Sep 2024 00:04:12 +1000 Subject: [PATCH] Changes from #12236 for EE11 Signed-off-by: Lachlan Roberts --- .../jetty/ee11/websocket/tests/WebSocketOverHTTP2Test.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee11/websocket/tests/WebSocketOverHTTP2Test.java b/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee11/websocket/tests/WebSocketOverHTTP2Test.java index 23f68631075..d0361ff3faa 100644 --- a/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee11/websocket/tests/WebSocketOverHTTP2Test.java +++ b/jetty-ee11/jetty-ee11-websocket/jetty-ee11-websocket-jetty-tests/src/test/java/org/eclipse/jetty/ee11/websocket/tests/WebSocketOverHTTP2Test.java @@ -69,6 +69,7 @@ import org.eclipse.jetty.websocket.api.exceptions.UpgradeException; import org.eclipse.jetty.websocket.client.WebSocketClient; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; import org.junit.jupiter.api.condition.OS; @@ -169,6 +170,7 @@ public class WebSocketOverHTTP2Test } @Test + @Tag("flaky") // See analysis in #12235. public void testWebSocketOverDynamicHTTP2() throws Exception { testWebSocketOverDynamicTransport(clientConnector -> new ClientConnectionFactoryOverHTTP2.HTTP2(new HTTP2Client(clientConnector)));