From 97e4ef4aa5bd56ca46ac477c1be33d44411aca17 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Wed, 17 Aug 2016 22:08:25 +0300 Subject: [PATCH] Do not run websocket tests on Karaf 4 Karaf 4.0.5 uses Jetty 9 but has no websocket support available by default Change-Id: I02b79f9d60cc2c151b51c0a22c891d89f43bfdaa --- .../vaadin/tests/tb3/ServletIntegrationTests.java | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/ServletIntegrationTests.java b/uitest/src/test/java/com/vaadin/tests/tb3/ServletIntegrationTests.java index 78307beba8..bf0387d468 100644 --- a/uitest/src/test/java/com/vaadin/tests/tb3/ServletIntegrationTests.java +++ b/uitest/src/test/java/com/vaadin/tests/tb3/ServletIntegrationTests.java @@ -36,27 +36,16 @@ public class ServletIntegrationTests { public static Set notWebsocketCompatible = new HashSet(); static { - notJSR356Compatible.add("jetty7"); notJSR356Compatible.add("jetty8"); notJSR356Compatible.add("tomcat7"); notJSR356Compatible.add("tomcat7apacheproxy"); - notJSR356Compatible.add("osgi"); // Karaf 3, Jetty 8 - // In theory GF3 could work but in reality broken - notWebsocketCompatible.add("glassfish3"); - notWebsocketCompatible.add("jboss4"); - notWebsocketCompatible.add("jboss5"); - notWebsocketCompatible.add("jboss6"); - notWebsocketCompatible.add("jboss7"); - notWebsocketCompatible.add("tomcat6"); notWebsocketCompatible.add("tomcat7apacheproxy"); notWebsocketCompatible.add("weblogic10"); notWebsocketCompatible.add("wildfly9-nginx"); - // Requires an update to 8.5.5 and a fix for - // https://dev.vaadin.com/ticket/16354 - // https://developer.ibm.com/answers/questions/186066/websocket-paths-using-uri-templates-do-not-work-pr/ - notWebsocketCompatible.add("websphere8"); + // Jetty 9 but no ws support by default + notWebsocketCompatible.add("karaf4"); // If a server does not support any kind of websockets it does not // support JSR-356 either.. -- 2.39.5