Repository: hadoop Updated Branches: refs/heads/HDFS-7240 677673f0d -> 0f5231374
HDFS-12898. Ozone: TestSCMCli#testHelp and TestSCMCli#testNonExistCommand fail consistently. Contributed by Shashikant Banerjee. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0f523137 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0f523137 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0f523137 Branch: refs/heads/HDFS-7240 Commit: 0f5231374c1893eb965fe0fb66d488d0050ab3f3 Parents: 677673f Author: Nanda kumar <[email protected]> Authored: Wed Dec 6 23:40:47 2017 +0530 Committer: Nanda kumar <[email protected]> Committed: Wed Dec 6 23:40:47 2017 +0530 ---------------------------------------------------------------------- .../src/test/java/org/apache/hadoop/ozone/scm/TestSCMCli.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0f523137/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestSCMCli.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestSCMCli.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestSCMCli.java index 0afc8dc..d067247 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestSCMCli.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/scm/TestSCMCli.java @@ -329,7 +329,7 @@ public class TestSCMCli { assertTrue(errContent.toString() .contains("Unrecognized options:[-nothingUseful]")); String expectedOut = - "usage: hdfs scm <commands> [<options>]\n" + + "usage: hdfs scmcli <commands> [<options>]\n" + "where <commands> can be one of the following\n" + " -container Container related options\n"; assertEquals(expectedOut, testContent.toString()); @@ -470,7 +470,7 @@ public class TestSCMCli { String[] args = {"-help"}; assertEquals(ResultCode.SUCCESS, cli.run(args)); String expected = - "usage: hdfs scm <commands> [<options>]\n" + + "usage: hdfs scmcli <commands> [<options>]\n" + "where <commands> can be one of the following\n" + " -container Container related options\n"; assertEquals(expected, testContent.toString()); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
