YARN-700. Merging change r1492383 from trunk to branch-2.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1492386 13f79535-47bb-0310-9956-ffa450edef68

hadoop-yarn-project/CHANGES.txt

@@ -477,6 +477,9 @@ Release 2.1.0-beta - UNRELEASED
     YARN-767. Initialize application metrics at RM bootup. (Jian He via
     acmurthy) 
 
+    YARN-700. TestInfoBlock fails on Windows because of line ending missmatch.
+    (Ivan Mitic via cnauroth)
+
   BREAKDOWN OF HADOOP-8562 SUBTASKS AND RELATED JIRAS
 
     YARN-158. Yarn creating package-info.java must not depend on sh.

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestInfoBlock.java

@@ -70,12 +70,12 @@ public class TestInfoBlock {
     WebAppTests.testBlock(MultilineInfoBlock.class);
     TestInfoBlock.pw.flush();
     String output = TestInfoBlock.sw.toString().replaceAll(" +", " ");
-    String expectedSinglelineData = "<tr class=\"odd\">\n"
-      + " <th>\n Single_line_value\n <td>\n This is one line.\n";
-    String expectedMultilineData = "<tr class=\"even\">\n"
-      + " <th>\n Multiple_line_value\n <td>\n <div>\n"
-      + " This is first line.\n </div>\n <div>\n"
-      + " This is second line.\n </div>\n";
+    String expectedSinglelineData = String.format("<tr class=\"odd\">%n"
+      + " <th>%n Single_line_value%n <td>%n This is one line.%n");
+    String expectedMultilineData = String.format("<tr class=\"even\">%n"
+      + " <th>%n Multiple_line_value%n <td>%n <div>%n"
+      + " This is first line.%n </div>%n <div>%n"
+      + " This is second line.%n </div>%n");
     assertTrue(output.contains(expectedSinglelineData) && output.contains(expectedMultilineData));
   }
 }