Author: cnauroth
Date: Wed Oct 30 21:16:13 2013
New Revision: 1537307
URL: http://svn.apache.org/r1537307
Log:
YARN-1358. Merging change r1537305 from trunk to branch-2.
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt?rev=1537307&r1=1537306&r2=1537307&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Wed Oct 30
21:16:13 2013
@@ -150,6 +150,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/branches/branch-2/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/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java?rev=1537307&r1=1537306&r2=1537307&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java
Wed Oct 30 21:16:13 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 {
