HDFS-8568. TestClusterId#testFormatWithEmptyClusterIdOption is failing. Contributed by Rakesh R.

(cherry picked from commit 3c2397cb041068172c8ad209996414d7371d2eca)

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -275,6 +275,9 @@ Release 2.8.0 - UNRELEASED
     HDFS-8552. Fix hdfs CLI usage message for namenode and zkfc.
     (Brahma Reddy Battula via xyao)
 
+    HDFS-8568. TestClusterId#testFormatWithEmptyClusterIdOption is failing.
+    (Rakesh R. via xyao)
+
   OPTIMIZATIONS
 
     HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than

hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestClusterId.java

@@ -236,7 +236,7 @@ public class TestClusterId {
     NameNode.createNameNode(argv, config);
 
     // Check if usage is printed
-    assertTrue(baos.toString("UTF-8").contains("Usage: java NameNode"));
+    assertTrue(baos.toString("UTF-8").contains("Usage: hdfs namenode"));
     System.setErr(origErr);
 
     // check if the version file does not exists.
@@ -262,7 +262,7 @@ public class TestClusterId {
     NameNode.createNameNode(argv, config);
 
     // Check if usage is printed
-    assertTrue(baos.toString("UTF-8").contains("Usage: java NameNode"));
+    assertTrue(baos.toString("UTF-8").contains("Usage: hdfs namenode"));
     System.setErr(origErr);
 
     // check if the version file does not exists.
@@ -289,7 +289,7 @@ public class TestClusterId {
     NameNode.createNameNode(argv, config);
 
     // Check if usage is printed
-    assertTrue(baos.toString("UTF-8").contains("Usage: java NameNode"));
+    assertTrue(baos.toString("UTF-8").contains("Usage: hdfs namenode"));
     System.setErr(origErr);
 
     // check if the version file does not exists.