Merge pull request #10917 from stuartwdouglas/WFLY-9872

WFLY-9872 JspTagTestCase fails intermittently
wildfly · Feb 21, 2018 · 04c1f1b · 04c1f1b
2 parents c2ff685 + 152418a
commit 04c1f1b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/...suite/integration/web/src/test/java/org/jboss/as/test/integration/jsp/JspTagTestCase.java b/...suite/integration/web/src/test/java/org/jboss/as/test/integration/jsp/JspTagTestCase.java
@@ -63,7 +63,8 @@ public static WebArchive deploy() {
 
     @Test
     public void test(@ArquillianResource URL url) throws Exception {
-        Assert.assertEquals(RESULT,HttpRequest.get(url + "index.jsp", 10, TimeUnit.SECONDS));
-        Assert.assertEquals(RESULT,HttpRequest.get(url + "index2.jsp", 10, TimeUnit.SECONDS));
+        //we ignore line ending differences
+        Assert.assertEquals(RESULT.replace("\r", ""),HttpRequest.get(url + "index.jsp", 10, TimeUnit.SECONDS).replace("\r", ""));
+        Assert.assertEquals(RESULT.replace("\r", ""),HttpRequest.get(url + "index2.jsp", 10, TimeUnit.SECONDS).replace("\r", ""));
     }
 }