svn commit: r793983 - in /hadoop/hdfs/trunk: CHANGES.txt src/test/hdfs/org/apache/hadoop/cli/testHDFSConf.xml

[szetszwo]

Author: szetszwo
Date: Tue Jul 14 17:29:30 2009
New Revision: 793983

URL: http://svn.apache.org/viewvc?rev=793983&view=rev
Log:
HDFS-489. Update TestHDFSCLI for the -skipTrash option in rm. Contributed by 
Jakob Homan

Modified:
    hadoop/hdfs/trunk/CHANGES.txt
    hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/cli/testHDFSConf.xml

Modified: hadoop/hdfs/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=793983&r1=793982&r2=793983&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Tue Jul 14 17:29:30 2009
@@ -71,6 +71,9 @@
 
     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

Modified: hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/cli/testHDFSConf.xml
URL: 
http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/cli/testHDFSConf.xml?rev=793983&r1=793982&r2=793983&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/cli/testHDFSConf.xml 
(original)
+++ hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/cli/testHDFSConf.xml Tue 
Jul 14 17:29:30 2009
@@ -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>