Author: cnauroth Date: Wed Jun 12 19:18:39 2013 New Revision: 1492383 URL: http://svn.apache.org/r1492383 Log: TestInfoBlock fails on Windows because of line ending missmatch. Contributed by Ivan Mitic.
Modified: hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestInfoBlock.java Modified: hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt?rev=1492383&r1=1492382&r2=1492383&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt Wed Jun 12 19:18:39 2013 @@ -497,6 +497,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. Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestInfoBlock.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestInfoBlock.java?rev=1492383&r1=1492382&r2=1492383&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestInfoBlock.java (original) +++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/view/TestInfoBlock.java Wed Jun 12 19:18:39 2013 @@ -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)); } } \ No newline at end of file