HDFS-7751. Fix TestHDFSCLI for quota with storage type. Contributed by Xiaoyu Yao

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

@@ -20,7 +20,7 @@ Trunk (Unreleased)
 
     HDFS-3689. Add support for variable length block. (jing9)
 
-    HDFS-7584. Quota by Storage Type API, tools and ClientNameNode Protocol
+    HDFS-7720. Quota by Storage Type API, tools and ClientNameNode Protocol
     changes. (Xiaoyu Yao via Arpit Agarwal)
 
   IMPROVEMENTS
@@ -284,6 +284,9 @@ Trunk (Unreleased)
     HDFS-7721. The HDFS BlockScanner may run fast during the first hour
     (cmccabe)
 
+    HDFS-7751. Fix TestHDFSCLI for quota with storage type.  (Xiaoyu Yao
+    via szetszwo)
+
 Release 2.7.0 - UNRELEASED
 
   INCOMPATIBLE CHANGES

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

@@ -15550,10 +15550,6 @@
           <type>RegexpComparator</type>
           <expected-output>^( |\t)*It does not fault if the directory has no quota.( )*</expected-output>
         </comparator>
-        <comparator>
-          <type>RegexpComparator</type>
-          <expected-output>^( |\t)*The storage type specific quota is cleared when -storageType option is specified.( )*</expected-output>
-        </comparator>
       </comparators>
     </test>
 
@@ -15620,6 +15616,10 @@
           <type>RegexpComparator</type>
           <expected-output>^( |\t)*It does not fault if the directory has no quota.( )*</expected-output>
         </comparator>
+        <comparator>
+          <type>RegexpComparator</type>
+          <expected-output>^( |\t)*The storage type specific quota is cleared when -storageType option is specified.( )*</expected-output>
+        </comparator>
       </comparators>
     </test>