Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-1358. Merging change r1537305 from trunk to branch-2. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1537307 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Chris Nauroth 2013-10-30 21:16:13 +00:00
parent f6bb3ce621
commit bbda888b57
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/CHANGES.txt
View File

@ -150,6 +150,9 @@ Release 2.2.1 - UNRELEASED
YARN-1357. TestContainerLaunch.testContainerEnvVariables fails on Windows. YARN-1357. TestContainerLaunch.testContainerEnvVariables fails on Windows.
(Chuan Liu via cnauroth) (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 Release 2.2.0 - 2013-10-13
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

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

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