Index: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java =================================================================== --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java (revision 1536470) +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/cli/TestYarnCLI.java (working copy) @@ -875,8 +875,8 @@ 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 @@ 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 {