YARN-1358. Merging change r1537307 from branch-2 to branch-2.2

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

hadoop-yarn-project/CHANGES.txt

@@ -65,6 +65,9 @@ Release 2.2.1 - UNRELEASED
     YARN-1357. TestContainerLaunch.testContainerEnvVariables fails on Windows.
     (Chuan Liu via cnauroth)
 
+    YARN-1358. TestYarnCLI fails on Windows due to line endings. (Chuan Liu via
+    cnauroth)
+
 Release 2.2.0 - 2013-10-13
 
   INCOMPATIBLE CHANGES

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java

@@ -875,8 +875,8 @@ public class TestYarnCLI {
     ApplicationCLI cli = createAndGetAppCLI();
     int result = cli.run(new String[] { "-status" });
     Assert.assertEquals(result, -1);
-    Assert.assertEquals("Missing argument for options\n"
-        + createApplicationCLIHelpMessage(), sysOutStream.toString());
+    Assert.assertEquals(String.format("Missing argument for options%n%1s",
+        createApplicationCLIHelpMessage()), sysOutStream.toString());
 
     sysOutStream.reset();
     NodeCLI nodeCLI = new NodeCLI();
@@ -885,8 +885,8 @@ public class TestYarnCLI {
     nodeCLI.setSysErrPrintStream(sysErr);
     result = nodeCLI.run(new String[] { "-status" });
     Assert.assertEquals(result, -1);
-    Assert.assertEquals("Missing argument for options\n"
-        + createNodeCLIHelpMessage(), sysOutStream.toString());
+    Assert.assertEquals(String.format("Missing argument for options%n%1s",
+        createNodeCLIHelpMessage()), sysOutStream.toString());
   }
 
   private void verifyUsageInfo(YarnCLI cli) throws Exception {