From 27a08797983fb03fb621633a2a826f91a9c78022 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Fri, 2 Oct 2020 15:39:49 +1000 Subject: [PATCH] dont run WebsocketClientInWebapp test with JPMS --- .../jetty/tests/distribution/DistributionTests.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java index d4c6896b059..4b1f999fe3c 100644 --- a/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java +++ b/tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/DistributionTests.java @@ -309,10 +309,8 @@ public class DistributionTests extends AbstractDistributionTest } } - @ParameterizedTest - @ValueSource(strings = {"", "--jpms"}) - @DisabledOnJre({JRE.JAVA_14, JRE.JAVA_15}) - public void testWebsocketClientInWebapp(String arg) throws Exception + @Test + public void testWebsocketClientInWebapp() throws Exception { Path jettyBase = Files.createTempDirectory("jetty_base"); String jettyVersion = System.getProperty("jettyVersion"); @@ -337,7 +335,6 @@ public class DistributionTests extends AbstractDistributionTest int port = distribution.freePort(); String[] args2 = { - arg, "jetty.http.port=" + port, // "jetty.server.dumpAfterStart=true", // "jetty.webapp.addSystemClasses+=,org.eclipse.jetty.client.",