Merge pull request #2690 from batmat/fix-windows-build

[JENKINS-40290] Fix test failing on Windows because of line feed assumption
jenkinsci · Jan 7, 2017 · 5483ee1 · 5483ee1
2 parents 6f98376 + fceabf0
commit 5483ee1
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/core/src/test/java/hudson/model/RunTest.java b/core/src/test/java/hudson/model/RunTest.java
@@ -189,7 +189,8 @@ public void getLogReturnsAnRightOrder() throws Exception {
         for (int i = 1; i < 10; i++) {
             assertEquals("dummy" + (10+i), logLines.get(i));
         }
-        assertEquals("[...truncated 68 B...]", logLines.get(0));
+        int truncatedCount = 10* ("dummyN".length() + System.getProperty("line.separator").length()) - 2;
+        assertEquals("[...truncated "+truncatedCount+" B...]", logLines.get(0));
     }
 
     @Test