HDFS-489. Update TestHDFSCLI for the -skipTrash option in rm. Contributed by Jakob Homan

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hdfs/trunk@793983 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -71,6 +71,9 @@ Trunk (unreleased changes)
 
     HDFS-462. loadFSImage should close edits file. (Jakob Homan via shv)
 
+    HDFS-489. Update TestHDFSCLI for the -skipTrash option in rm. (Jakob Homan
+    via szetszwo)
+
 Release 0.20.1 - Unreleased
 
   IMPROVEMENTS

src/test/hdfs/org/apache/hadoop/cli/testHDFSConf.xml

@@ -15326,11 +15326,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^-rm &lt;src&gt;:( |\t)*Delete all files that match the specified file pattern.( )*</expected-output>
+          <expected-output>^-rm \[-skipTrash\] &lt;src&gt;:( |\t)*Delete all files that match the specified file pattern.( )*</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^( |\t)*Equivlent to the Unix command "rm &lt;src&gt;"( )*</expected-output>
+          <expected-output>^( |\t)*Equivalent to the Unix command "rm &lt;src&gt;"( )*</expected-output>
+        </comparator>
+        <comparator>
+          <type>RegexpComparator</type>
+          <expected-output>^( |\t)*-skipTrash option bypasses trash, if enabled, and immediately( )*</expected-output>
+        </comparator>
+        <comparator>
+          <type>RegexpComparator</type>
+          <expected-output>^( |\t)*deletes &lt;src&gt;( )*</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -15345,11 +15353,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^-rmr &lt;src&gt;:( |\t)*Remove all directories which match the specified file( )*</expected-output>
+          <expected-output>^-rmr \[-skipTrash\] &lt;src&gt;:( |\t)*Remove all directories which match the specified file( )*</expected-output>
+        </comparator>
+        <comparator>
+          <type>RegexpComparator</type>
+          <expected-output>^( |\t)*pattern. Equivalent to the Unix command "rm -rf &lt;src&gt;"( )*</expected-output>
+        </comparator>
+        <comparator>
+          <type>RegexpComparator</type>
+          <expected-output>^( |\t)*-skipTrash option bypasses trash, if enabled, and immediately( )*</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^( |\t)*pattern. Equivlent to the Unix command "rm -rf &lt;src&gt;"( )*</expected-output>
+          <expected-output>^( |\t)*deletes &lt;src&gt;( )*</expected-output>
         </comparator>
       </comparators>
     </test>