HDFS-16041. TestErasureCodingCLI fails (#3052)

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ContentSummary.java

@@ -466,7 +466,9 @@ public class ContentSummary extends QuotaUsage implements Writable{
    * @return Constant-width String representation of Erasure Coding Policy
    */
   public String toErasureCodingPolicy() {
-    return String.format(ERASURECODING_POLICY_FORMAT, erasureCodingPolicy);
+    return String.format(ERASURECODING_POLICY_FORMAT,
+        erasureCodingPolicy.equals("Replicated")
+            ? erasureCodingPolicy : "EC:" + erasureCodingPolicy);
   }
 
   /**

hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testErasureCodingConf.xml

@@ -983,7 +983,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*1( |\t)*2( |\t)*0 EC:[A-Za-z0-9-]{1,}( )*/dir1</expected-output>
+          <expected-output>( |\t)*1( |\t)*2( |\t)*0( )*EC:[A-Za-z0-9-]{1,}( )*/dir1</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1004,7 +1004,7 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>( |\t)*0( |\t)*1( |\t)*0 [A-Za-z0-9-]{1,}( )*/file1</expected-output>
+          <expected-output>( |\t)*0( |\t)*1( |\t)*0( )*[A-Za-z0-9-]{1,}( )*/file1</expected-output>
         </comparator>
       </comparators>
     </test>