hadoop-yarn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cnaur...@apache.org
Subject svn commit: r1537305 - in /hadoop/common/trunk/hadoop-yarn-project: CHANGES.txt hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java
Date Wed, 30 Oct 2013 21:13:05 GMT
Author: cnauroth
Date: Wed Oct 30 21:13:05 2013
New Revision: 1537305

URL: http://svn.apache.org/r1537305
Log:
YARN-1358. TestYarnCLI fails on Windows due to line endings. Contributed by Chuan Liu.

Modified:
    hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt
    hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.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=1537305&r1=1537304&r2=1537305&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-yarn-project/CHANGES.txt Wed Oct 30 21:13:05 2013
@@ -165,6 +165,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

Modified: hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java?rev=1537305&r1=1537304&r2=1537305&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java
(original)
+++ hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java
Wed Oct 30 21:13:05 2013
@@ -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 {



Mime
View raw message