From 74b91b78fee96404f1362b40217b4e456beaac6a Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 13 Apr 2021 10:22:57 +0100 Subject: [PATCH] Temporarily disable h2c tests with Jetty 10 Closes gh-26038 --- .../embedded/jetty/Jetty10ServletWebServerFactoryTests.java | 6 ++++++ .../server/AbstractServletWebServerFactoryTests.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/Jetty10ServletWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/Jetty10ServletWebServerFactoryTests.java index d35cff231d..66f0111a3a 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/Jetty10ServletWebServerFactoryTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/jetty/Jetty10ServletWebServerFactoryTests.java @@ -54,4 +54,10 @@ public class Jetty10ServletWebServerFactoryTests extends JettyServletWebServerFa protected void jettyConfigurations() throws Exception { } + @Override + @Disabled("https://github.com/eclipse/jetty.project/issues/6164") + protected void whenHttp2IsEnabledAndSslIsDisabledThenH2cCanBeUsed() { + + } + } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java index 625e833d69..e1fead8881 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java @@ -1130,7 +1130,7 @@ public abstract class AbstractServletWebServerFactoryTests { } @Test - void whenHttp2IsEnabledAndSslIsDisabledThenH2cCanBeUsed() + protected void whenHttp2IsEnabledAndSslIsDisabledThenH2cCanBeUsed() throws InterruptedException, ExecutionException, IOException { AbstractServletWebServerFactory factory = getFactory(); Http2 http2 = new Http2();