From 9e15e01f36847acdaaf6407b7ba990fb011f8df9 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Wed, 19 Apr 2017 18:01:12 -0700
Subject: [PATCH] Allowing URLStreamHandler test to exist in codebase, but not
 run in CI

---
 jetty-webapp/pom.xml                                           | 3 +++
 .../java/org/eclipse/jetty/webapp/WebAppClassLoaderTest.java   | 2 +-
 .../eclipse/jetty/webapp/WebAppClassLoaderUrlStreamTest.java   | 2 --
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml
index 736fea38a37..49538ce5180 100644
--- a/jetty-webapp/pom.xml
+++ b/jetty-webapp/pom.xml
@@ -38,6 +38,9 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
+          <excludes>
+            <exclude>org.eclipse.jetty.webapp.WebAppClassLoaderUrlStreamTest</exclude>
+          </excludes>
           <forkCount>1</forkCount>
           <reuseForks>false</reuseForks>
         </configuration>
diff --git a/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppClassLoaderTest.java b/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppClassLoaderTest.java
index 2974ea9f3d0..dbf4970a9f9 100644
--- a/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppClassLoaderTest.java
+++ b/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppClassLoaderTest.java
@@ -245,7 +245,7 @@ public class WebAppClassLoaderTest
     public void testResources() throws Exception
     {
         // The existence of a URLStreamHandler changes the behavior
-        assumeThat("No URLStreamHandler in place", URLStreamHandlerUtil.getFactory(), nullValue());
+        assumeThat("URLStreamHandler changes behavior, skip test", URLStreamHandlerUtil.getFactory(), nullValue());
         
         List<URL> expected = new ArrayList<>();
         List<URL> resources;
diff --git a/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppClassLoaderUrlStreamTest.java b/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppClassLoaderUrlStreamTest.java
index 74229a0b0e8..296285052e6 100644
--- a/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppClassLoaderUrlStreamTest.java
+++ b/jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppClassLoaderUrlStreamTest.java
@@ -25,9 +25,7 @@ import java.util.Map;
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 
-@Ignore("Not suitable for testing on CI (as URL object is modified)")
 public class WebAppClassLoaderUrlStreamTest extends WebAppClassLoaderTest
 {
     public static class URLHandlers implements URLStreamHandlerFactory