hadoop-hdfs-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From szets...@apache.org
Subject svn commit: r1127734 [2/3] - in /hadoop/hdfs/branches/yahoo-merge: ./ src/c++/libhdfs/ src/contrib/hdfsproxy/ src/java/ src/test/hdfs/ src/test/hdfs/org/apache/hadoop/cli/ src/test/hdfs/org/apache/hadoop/hdfs/ src/webapps/datanode/ src/webapps/hdfs/ sr...
Date Wed, 25 May 2011 23:47:05 GMT
Modified: hadoop/hdfs/branches/yahoo-merge/src/test/hdfs/org/apache/hadoop/cli/testHDFSConf.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/branches/yahoo-merge/src/test/hdfs/org/apache/hadoop/cli/testHDFSConf.xml?rev=1127734&r1=1127733&r2=1127734&view=diff
==============================================================================
--- hadoop/hdfs/branches/yahoo-merge/src/test/hdfs/org/apache/hadoop/cli/testHDFSConf.xml (original)
+++ hadoop/hdfs/branches/yahoo-merge/src/test/hdfs/org/apache/hadoop/cli/testHDFSConf.xml Wed May 25 23:47:04 2011
@@ -66,7 +66,7 @@
         <command>-fs NAMENODE -ls file*</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -95,7 +95,7 @@
         <command>-fs NAMENODE -ls /</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /dir1</command>
+        <command>-fs NAMENODE -rm -r /dir1</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -116,7 +116,7 @@
         <command>-fs NAMENODE -ls </command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr dir1</command>
+        <command>-fs NAMENODE -rm -r dir1</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -140,7 +140,7 @@
         <command>-fs NAMENODE -ls </command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -424,9 +424,9 @@
       </comparators>
     </test>
 
-    <!-- Tests for lsr -->
+    <!-- Tests for ls -R -->
     <test> <!-- TESTED -->
-      <description>lsr: files/directories using absolute path</description>
+      <description>ls: files/directories using absolute path</description>
       <test-commands>
         <command>-fs NAMENODE -mkdir /dir0</command>
         <command>-fs NAMENODE -mkdir /dir0/dir1</command>
@@ -444,10 +444,10 @@
         <command>-fs NAMENODE -touchz /dir0/dir1/dir1/file2</command>
         <command>-fs NAMENODE -touchz /dir0/dir2/dir2/file1</command>
         <command>-fs NAMENODE -touchz /dir0/dir2/dir2/file2</command>
-        <command>-fs NAMENODE -lsr /dir0</command>
+        <command>-fs NAMENODE -ls -R /dir0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /dir0</command>
+        <command>-fs NAMENODE -rm -r /dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -514,7 +514,7 @@
     </test>
     
     <test> <!-- TESTED -->
-      <description>lsr: files/directories using relative path</description>
+      <description>ls: files/directories using relative path</description>
       <test-commands>
         <command>-fs NAMENODE -mkdir dir0</command>
         <command>-fs NAMENODE -mkdir dir0/dir1</command>
@@ -532,10 +532,10 @@
         <command>-fs NAMENODE -touchz dir0/dir1/dir1/file2</command>
         <command>-fs NAMENODE -touchz dir0/dir2/dir2/file1</command>
         <command>-fs NAMENODE -touchz dir0/dir2/dir2/file2</command>
-        <command>-fs NAMENODE -lsr dir0</command>
+        <command>-fs NAMENODE -ls -R dir0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -602,7 +602,7 @@
     </test>
     
     <test> <!-- TESTED -->
-      <description>lsr: files/directories using globbing</description>
+      <description>ls: files/directories using globbing</description>
       <test-commands>
         <command>-fs NAMENODE -mkdir dir0</command>
         <command>-fs NAMENODE -mkdir dir0/dir1</command>
@@ -620,10 +620,10 @@
         <command>-fs NAMENODE -touchz dir0/dir1/dir1/file2</command>
         <command>-fs NAMENODE -touchz dir0/dir2/dir2/file1</command>
         <command>-fs NAMENODE -touchz dir0/dir2/dir2/file2</command>
-        <command>-fs NAMENODE -lsr dir0/*</command>
+        <command>-fs NAMENODE -ls -R dir0/*</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <!-- JIRA?
@@ -692,44 +692,44 @@
     </test>
     
     <test> <!-- TESTED -->
-      <description>lsr: file/directory that does not exist in /</description>
+      <description>ls: file/directory that does not exist in /</description>
       <test-commands>
-        <command>-fs NAMENODE -lsr /file1</command>
+        <command>-fs NAMENODE -ls -R /file1</command>
       </test-commands>
       <cleanup-commands>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^lsr: `/file1': No such file or directory</expected-output>
+          <expected-output>^ls: `/file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
     
     <test> <!-- TESTED -->
-      <description>lsr: file/directory that does not exist in home directory (/user/username)</description>
+      <description>ls: file/directory that does not exist in home directory (/user/username)</description>
       <test-commands>
-        <command>-fs NAMENODE -lsr /user</command>
+        <command>-fs NAMENODE -ls -R /user</command>
       </test-commands>
       <cleanup-commands>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^lsr: `/user': No such file or directory</expected-output>
+          <expected-output>^ls: `/user': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
     
     <test> <!-- TESTED -->
-      <description>lsr: dir at hdfs:// path</description>
+      <description>ls: dir at hdfs:// path</description>
       <test-commands>
         <command>-fs NAMENODE -mkdir hdfs:///dir0</command>
         <command>-fs NAMENODE -mkdir hdfs:///dir0/dir1</command>
         <command>-fs NAMENODE -touchz hdfs:///file1</command>
         <command>-fs NAMENODE -touchz hdfs:///dir0/file1</command>
         <command>-fs NAMENODE -touchz hdfs:///dir0/dir1/file1</command>
-        <command>-fs NAMENODE -lsr hdfs:///</command>
+        <command>-fs NAMENODE -ls -R hdfs:///</command>
       </test-commands>
       <cleanup-commands>
         <command>-fs NAMENODE -rm hdfs:///dir0</command>
@@ -760,16 +760,16 @@
     </test>
 
     <test> <!-- TESTED -->
-      <description>lsr: files/directories in hdfs:// path using globbing</description>
+      <description>ls: files/directories in hdfs:// path using globbing</description>
       <test-commands>
         <command>-fs NAMENODE -mkdir hdfs:///dir0</command>
         <command>-fs NAMENODE -mkdir hdfs:///dir0/dir1</command>
         <command>-fs NAMENODE -touchz hdfs:///dir0/file1</command>
         <command>-fs NAMENODE -touchz hdfs:///dir0/dir1/file1</command>
-        <command>-fs NAMENODE -lsr hdfs:///dir0/*</command>
+        <command>-fs NAMENODE -ls -R hdfs:///dir0/*</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///dir0</command>
+        <command>-fs NAMENODE -rm -r hdfs:///dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -784,29 +784,29 @@
     </test>
      
     <test> <!-- TESTED -->
-      <description>lsr: Non-existent file/directory in hdfs:// path</description>
+      <description>ls: Non-existent file/directory in hdfs:// path</description>
       <test-commands>
-        <command>-fs NAMENODE -lsr hdfs:///file1</command>
+        <command>-fs NAMENODE -ls -R hdfs:///file1</command>
       </test-commands>
       <cleanup-commands>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^lsr: `hdfs:///file1': No such file or directory</expected-output>
+          <expected-output>^ls: `hdfs:///file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
     
     <test> <!-- TESTED -->
-      <description>lsr: dir at Namenode's path</description>
+      <description>ls: dir at Namenode's path</description>
       <test-commands>
         <command>-fs NAMENODE -mkdir NAMENODE/dir0</command>
         <command>-fs NAMENODE -mkdir NAMENODE/dir0/dir1</command>
         <command>-fs NAMENODE -touchz NAMENODE/file1</command>
         <command>-fs NAMENODE -touchz NAMENODE/dir0/file1</command>
         <command>-fs NAMENODE -touchz NAMENODE/dir0/dir1/file1</command>
-        <command>-fs NAMENODE -lsr NAMENODE/</command>
+        <command>-fs NAMENODE -ls -R NAMENODE/</command>
       </test-commands>
       <cleanup-commands>
         <command>-fs NAMENODE -rm hdfs:///dir0</command>
@@ -837,16 +837,16 @@
     </test>
 
     <test> <!-- TESTED -->
-      <description>lsr: Non-URI input files/directories in Namenode's path </description>
+      <description>ls: Non-URI input files/directories in Namenode's path </description>
       <test-commands>
         <command>-fs NAMENODE -mkdir NAMENODE/dir0</command>
         <command>-fs NAMENODE -mkdir NAMENODE/dir0/dir1</command>
         <command>-fs NAMENODE -touchz NAMENODE/dir0/file1</command>
         <command>-fs NAMENODE -touchz NAMENODE/dir0/dir1/file1</command>
-        <command>-fs NAMENODE -lsr NAMENODE/dir0/*</command>
+        <command>-fs NAMENODE -ls -R NAMENODE/dir0/*</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/dir0</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -861,30 +861,30 @@
     </test>
 
     <test> <!-- TESTED -->
-      <description>lsr: Non-URI input for non-existent file/directory in Namenode's path </description>
+      <description>ls: Non-URI input for non-existent file/directory in Namenode's path </description>
       <test-commands>
-        <command>-fs NAMENODE -lsr NAMENODE/file1</command>
+        <command>-fs NAMENODE -ls -R NAMENODE/file1</command>
       </test-commands>
       <cleanup-commands>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^lsr: `hdfs://\w+[.a-z]*:[0-9]+/file1': No such file or directory</expected-output>
+          <expected-output>^ls: `hdfs://\w+[.a-z]*:[0-9]+/file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
 
     <test> <!-- TESTED -->
-      <description>lsr: Test for /*/* globbing </description>
+      <description>ls: Test for /*/* globbing </description>
       <test-commands>
         <command>-fs NAMENODE -mkdir /dir0</command>
         <command>-fs NAMENODE -mkdir /dir0/dir1</command>
         <command>-fs NAMENODE -touchz /dir0/dir1/file1</command>
-        <command>-fs NAMENODE -lsr /\*/\*</command>
+        <command>-fs NAMENODE -ls -R /\*/\*</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /dir0</command>
+        <command>-fs NAMENODE -rm -r /dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -919,7 +919,7 @@
         <command>-fs NAMENODE -du data15bytes</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -939,7 +939,7 @@
         <command>-fs NAMENODE -du data*</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -969,7 +969,7 @@
         <command>-fs NAMENODE -du /dir0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /dir0</command>
+        <command>-fs NAMENODE -rm -r /dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -987,7 +987,7 @@
         <command>-fs NAMENODE -du dir0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -1008,7 +1008,7 @@
         <command>-fs NAMENODE -du /dir0/*</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /dir0</command>
+        <command>-fs NAMENODE -rm -r /dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -1057,7 +1057,7 @@
         <command>-fs NAMENODE -du hdfs:///data*</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///*</command>
+        <command>-fs NAMENODE -rm -r hdfs:///*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -1087,7 +1087,7 @@
         <command>-fs NAMENODE -du hdfs:///dir0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///dir0</command>
+        <command>-fs NAMENODE -rm -r hdfs:///dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -1106,7 +1106,7 @@
         <command>-fs NAMENODE -du -h hdfs:///dir0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///dir0</command>
+        <command>-fs NAMENODE -rm -r hdfs:///dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -1131,7 +1131,7 @@
         <command>-fs NAMENODE -du hdfs:///dir0/*</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///dir0</command>
+        <command>-fs NAMENODE -rm -r hdfs:///dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -1180,7 +1180,7 @@
         <command>-fs NAMENODE -du NAMENODE/data*</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/*</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -1210,7 +1210,7 @@
         <command>-fs NAMENODE -du NAMENODE/dir0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/dir0</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -1231,7 +1231,7 @@
         <command>-fs NAMENODE -du NAMENODE/dir0/*</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/dir0</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -1273,10 +1273,10 @@
         <command>-fs NAMENODE -put CLITEST_DATA/data120bytes /dir0/dir1/dir2/data120bytes</command>
         <command>-fs NAMENODE -put CLITEST_DATA/data60bytes /dir0/dir2/dir1/data60bytes</command>
         <command>-fs NAMENODE -put CLITEST_DATA/data120bytes /dir0/dir2/dir2/data120bytes</command>
-        <command>-fs NAMENODE -dus /dir0</command>
+        <command>-fs NAMENODE -du -s /dir0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /dir0</command>
+        <command>-fs NAMENODE -rm -r /dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -1305,10 +1305,10 @@
         <command>-fs NAMENODE -put CLITEST_DATA/data120bytes dir0/dir1/dir2/data120bytes</command>
         <command>-fs NAMENODE -put CLITEST_DATA/data60bytes dir0/dir2/dir1/data60bytes</command>
         <command>-fs NAMENODE -put CLITEST_DATA/data120bytes dir0/dir2/dir2/data120bytes</command>
-        <command>-fs NAMENODE -dus dir0</command>
+        <command>-fs NAMENODE -du -s dir0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -1342,11 +1342,11 @@
         <command>-fs NAMENODE -put CLITEST_DATA/data15bytes /donotcountdir0/data15bytes</command>
         <command>-fs NAMENODE -put CLITEST_DATA/data15bytes /donotcountdir0/data15bytes</command>
         <command>-fs NAMENODE -put CLITEST_DATA/data15bytes /donotcountdir0/data15bytes</command>
-        <command>-fs NAMENODE -dus /dir*</command>
+        <command>-fs NAMENODE -du -s /dir*</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /dir0</command>
-        <command>-fs NAMENODE -rmr /donotcountdir0</command>
+        <command>-fs NAMENODE -rm -r /dir0</command>
+        <command>-fs NAMENODE -rm -r /donotcountdir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -1376,10 +1376,10 @@
         <command>-fs NAMENODE -put CLITEST_DATA/data120bytes hdfs:///dir0/dir1/dir2/data120bytes</command>
         <command>-fs NAMENODE -put CLITEST_DATA/data60bytes hdfs:///dir0/dir2/dir1/data60bytes</command>
         <command>-fs NAMENODE -put CLITEST_DATA/data120bytes hdfs:///dir0/dir2/dir2/data120bytes</command>
-        <command>-fs NAMENODE -dus hdfs:///dir0</command>
+        <command>-fs NAMENODE -du -s hdfs:///dir0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///dir0</command>
+        <command>-fs NAMENODE -rm -r hdfs:///dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -1413,11 +1413,11 @@
         <command>-fs NAMENODE -put CLITEST_DATA/data15bytes hdfs:///donotcountdir0/data15bytes</command>
         <command>-fs NAMENODE -put CLITEST_DATA/data15bytes hdfs:///donotcountdir0/data15bytes</command>
         <command>-fs NAMENODE -put CLITEST_DATA/data15bytes hdfs:///donotcountdir0/data15bytes</command>
-        <command>-fs NAMENODE -dus hdfs:///dir*</command>
+        <command>-fs NAMENODE -du -s hdfs:///dir*</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///dir0</command>
-        <command>-fs NAMENODE -rmr hdfs:///donotcountdir0</command>
+        <command>-fs NAMENODE -rm -r hdfs:///dir0</command>
+        <command>-fs NAMENODE -rm -r hdfs:///donotcountdir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -1446,10 +1446,10 @@
         <command>-fs NAMENODE -put CLITEST_DATA/data120bytes NAMENODE/dir0/dir1/dir2/data120bytes</command>
         <command>-fs NAMENODE -put CLITEST_DATA/data60bytes NAMENODE/dir0/dir2/dir1/data60bytes</command>
         <command>-fs NAMENODE -put CLITEST_DATA/data120bytes NAMENODE/dir0/dir2/dir2/data120bytes</command>
-        <command>-fs NAMENODE -dus NAMENODE/dir0</command>
+        <command>-fs NAMENODE -du -s NAMENODE/dir0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/dir0</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -1483,11 +1483,11 @@
         <command>-fs NAMENODE -put CLITEST_DATA/data15bytes NAMENODE/donotcountdir0/data15bytes</command>
         <command>-fs NAMENODE -put CLITEST_DATA/data15bytes NAMENODE/donotcountdir0/data15bytes</command>
         <command>-fs NAMENODE -put CLITEST_DATA/data15bytes NAMENODE/donotcountdir0/data15bytes</command>
-        <command>-fs NAMENODE -dus NAMENODE/dir*</command>
+        <command>-fs NAMENODE -du -s NAMENODE/dir*</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/dir0</command>
-        <command>-fs NAMENODE -rmr NAMENODE/donotcountdir0</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/dir0</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/donotcountdir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -1531,12 +1531,12 @@
         <command>-fs NAMENODE -mv /file1 file2</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /file1</command>
+        <command>-fs NAMENODE -rm -r /file1</command>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^mv: Failed to rename hdfs://\w+[.a-z]*:[0-9]*/file1 to file2</expected-output>
+          <expected-output>^mv: `/file1' to `file2': Input/output error</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1547,10 +1547,10 @@
         <command>-fs NAMENODE -touchz /file1</command>
         <command>-fs NAMENODE -mkdir /dir0</command>
         <command>-fs NAMENODE -mv /file1 /dir0</command>
-        <command>-fs NAMENODE -lsr /dir0</command>        
+        <command>-fs NAMENODE -ls -R /dir0</command>        
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /dir0</command>
+        <command>-fs NAMENODE -rm -r /dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -1584,7 +1584,7 @@
         <command>-fs NAMENODE -ls /dir0</command>        
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /dir0</command>
+        <command>-fs NAMENODE -rm -r /dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -1618,10 +1618,10 @@
         <command>-fs NAMENODE -touchz /file4</command>
         <command>-fs NAMENODE -mkdir /dir0</command>
         <command>-fs NAMENODE -mv /file* /dir0</command>
-        <command>-fs NAMENODE -lsr /*</command>        
+        <command>-fs NAMENODE -ls -R /*</command>        
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /dir0</command>
+        <command>-fs NAMENODE -rm -r /dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -1716,10 +1716,10 @@
         <command>-fs NAMENODE -touchz hdfs:///file1</command>
         <command>-fs NAMENODE -mkdir hdfs:///dir0</command>
         <command>-fs NAMENODE -mv hdfs:///file1 hdfs:///dir0</command>
-        <command>-fs NAMENODE -lsr hdfs:///dir0</command>        
+        <command>-fs NAMENODE -ls -R hdfs:///dir0</command>        
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///dir0</command>
+        <command>-fs NAMENODE -rm -r hdfs:///dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -1754,7 +1754,7 @@
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>mv: `hdfs:/file1': No such file or directory</expected-output>
+          <expected-output>mv: `hdfs:///file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1768,7 +1768,7 @@
         <command>-fs NAMENODE -ls hdfs:///dir0</command>        
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///dir0</command>
+        <command>-fs NAMENODE -rm -r hdfs:///dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -1801,10 +1801,10 @@
         <command>-fs NAMENODE -touchz hdfs:///file3</command>
         <command>-fs NAMENODE -mkdir hdfs:///dir0</command>
         <command>-fs NAMENODE -mv hdfs:///file* hdfs:///dir0</command>
-        <command>-fs NAMENODE -lsr hdfs:///*</command>        
+        <command>-fs NAMENODE -ls -R hdfs:///*</command>        
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///dir0</command>
+        <command>-fs NAMENODE -rm -r hdfs:///dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -1869,10 +1869,10 @@
         <command>-fs NAMENODE -touchz NAMENODE/file1</command>
         <command>-fs NAMENODE -mkdir NAMENODE/dir0</command>
         <command>-fs NAMENODE -mv NAMENODE/file1 NAMENODE/dir0</command>
-        <command>-fs NAMENODE -lsr NAMENODE/dir0</command>
+        <command>-fs NAMENODE -ls -R NAMENODE/dir0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/dir0</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -1921,7 +1921,7 @@
         <command>-fs NAMENODE -ls NAMENODE/dir0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/dir0</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -1954,10 +1954,10 @@
         <command>-fs NAMENODE -touchz NAMENODE/file3</command>
         <command>-fs NAMENODE -mkdir NAMENODE/dir0</command>
         <command>-fs NAMENODE -mv NAMENODE/file* NAMENODE/dir0</command>
-        <command>-fs NAMENODE -lsr NAMENODE/*</command>
+        <command>-fs NAMENODE -ls -R NAMENODE/*</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/dir0</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -1997,7 +1997,7 @@
 	<command>-fs NAMENODE -mkdir hdfs:///dir1</command>
         <command>-fs NAMENODE -touchz hdfs:///dir0/file1</command>
         <command>-fs NAMENODE -mv hdfs:///dir0 hdfs:///dir1</command>
-        <command>-fs NAMENODE -lsr hdfs:///dir1</command>        
+        <command>-fs NAMENODE -ls -R hdfs:///dir1</command>        
       </test-commands>
       <cleanup-commands>
         <command>-fs NAMENODE -rm hdfs:///dir1</command>
@@ -2021,7 +2021,7 @@
         <command>-fs NAMENODE -mkdir NAMENODE/dir1</command>
         <command>-fs NAMENODE -touchz NAMENODE/dir0/file1</command>
         <command>-fs NAMENODE -mv NAMENODE/dir0 NAMENODE/dir1</command>
-        <command>-fs NAMENODE -lsr NAMENODE/dir1</command>
+        <command>-fs NAMENODE -ls -R NAMENODE/dir1</command>
       </test-commands>
       <cleanup-commands>
         <command>-fs NAMENODE -rm NAMENODE/dir1</command>
@@ -2069,7 +2069,7 @@
         <command>-fs NAMENODE -ls /file1 file2</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /file1 file2</command>
+        <command>-fs NAMENODE -rm -r /file1 file2</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -2091,7 +2091,7 @@
         <command>-fs NAMENODE -ls file1 /file2</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr file1 /file2</command>
+        <command>-fs NAMENODE -rm -r file1 /file2</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -2113,7 +2113,7 @@
         <command>-fs NAMENODE -ls file1 file2</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr file1 file2</command>
+        <command>-fs NAMENODE -rm -r file1 file2</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -2136,7 +2136,7 @@
         <command>-fs NAMENODE -ls /file1 /dir0</command>        
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /dir0</command>
+        <command>-fs NAMENODE -rm -r /dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -2159,7 +2159,7 @@
         <command>-fs NAMENODE -ls /file1 /dir0</command>        
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /dir0</command>
+        <command>-fs NAMENODE -rm -r /dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -2182,10 +2182,10 @@
         <command>-fs NAMENODE -touchz /file4</command>
         <command>-fs NAMENODE -mkdir /dir0</command>
         <command>-fs NAMENODE -cp /file* /dir0</command>
-        <command>-fs NAMENODE -lsr /*</command>        
+        <command>-fs NAMENODE -ls -R /*</command>        
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /dir0</command>
+        <command>-fs NAMENODE -rm -r /dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -2232,10 +2232,10 @@
         <command>-fs NAMENODE -touchz /file4</command>
         <command>-fs NAMENODE -mkdir /dir0</command>
         <command>-fs NAMENODE -cp /file1 /file2 /file3 /file4 /dir0</command>
-        <command>-fs NAMENODE -lsr /*</command>
+        <command>-fs NAMENODE -ls -R /*</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /dir0</command>
+        <command>-fs NAMENODE -rm -r /dir0 /file*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -2279,7 +2279,7 @@
         <command>-fs NAMENODE -cp /file /file1</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>:
       <comparators>
         <comparator>
@@ -2295,7 +2295,7 @@
         <command>-fs NAMENODE -cp file1 file2</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>:
       <comparators>
         <comparator>
@@ -2316,12 +2316,12 @@
         <command>-fs NAMENODE -cp /file* /file5</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cp: When copying multiple files, destination should be a directory.</expected-output>
+          <expected-output>^cp: `/file5': Is not a directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -2337,12 +2337,12 @@
         <command>-fs NAMENODE -cp /file1 /file2 /file3 /file4 /file5</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cp: When copying multiple files, destination /file5 should be a directory.</expected-output>
+          <expected-output>^cp: `/file5': Is not a directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -2357,12 +2357,12 @@
         <command>-fs NAMENODE -cp /file* dir</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cp: When copying multiple files, destination should be a directory.</expected-output>
+          <expected-output>^cp: `dir': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -2377,12 +2377,12 @@
         <command>-fs NAMENODE -cp /file1 /file2 /file3 /file4 dir</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cp: When copying multiple files, destination dir should be a directory.</expected-output>
+          <expected-output>^cp: `dir': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -2418,7 +2418,7 @@
         <command>-fs NAMENODE -ls hdfs:///file1 hdfs:///dir0</command>        
       </test-commands>
      <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///dir0/ hdfs://file1</command>
+        <command>-fs NAMENODE -rm -r hdfs:///dir0/ hdfs://file1</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -2441,7 +2441,7 @@
         <command>-fs NAMENODE -ls hdfs:///file1 hdfs:///dir0</command>        
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///dir0/</command>
+        <command>-fs NAMENODE -rm -r hdfs:///dir0/</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -2463,11 +2463,11 @@
         <command>-fs NAMENODE -touchz hdfs:///file3</command>
         <command>-fs NAMENODE -mkdir hdfs:///dir0</command>
         <command>-fs NAMENODE -cp hdfs:///file* hdfs:///dir0</command>
-        <command>-fs NAMENODE -lsr hdfs:///*</command>        
+        <command>-fs NAMENODE -ls -R hdfs:///*</command>        
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///file*</command>
-        <command>-fs NAMENODE -rmr hdfs:///dir0/</command>
+        <command>-fs NAMENODE -rm -r hdfs:///file*</command>
+        <command>-fs NAMENODE -rm -r hdfs:///dir0/</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -2505,11 +2505,11 @@
         <command>-fs NAMENODE -touchz hdfs:///file3</command>
         <command>-fs NAMENODE -mkdir hdfs:///dir0</command>
         <command>-fs NAMENODE -cp hdfs:///file1 hdfs:///file2 hdfs:///file3 hdfs:///dir0</command>
-        <command>-fs NAMENODE -lsr hdfs:///*</command>
+        <command>-fs NAMENODE -ls -R hdfs:///*</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///file*</command>
-        <command>-fs NAMENODE -rmr hdfs:///dir0/</command>
+        <command>-fs NAMENODE -rm -r hdfs:///file*</command>
+        <command>-fs NAMENODE -rm -r hdfs:///dir0/</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -2549,7 +2549,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cp: `hdfs:/file': No such file or directory</expected-output>
+          <expected-output>^cp: `hdfs:///file': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -2565,12 +2565,12 @@
         <command>-fs NAMENODE -cp hdfs:///file* hdfs:///file5</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///file*</command>
+        <command>-fs NAMENODE -rm -r hdfs:///file*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cp: When copying multiple files, destination should be a directory.</expected-output>
+          <expected-output>^cp: `hdfs:///file5': Is not a directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -2586,12 +2586,12 @@
         <command>-fs NAMENODE -cp hdfs:///file1 hdfs:///file2 hdfs:///file3 hdfs:///file4 hdfs:///file5</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///file*</command>
+        <command>-fs NAMENODE -rm -r hdfs:///file*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cp: When copying multiple files, destination hdfs:///file5 should be a directory.</expected-output>
+          <expected-output>^cp: `hdfs:///file5': Is not a directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -2606,12 +2606,12 @@
         <command>-fs NAMENODE -cp hdfs:///file* hdfs:///dir</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///file*</command>
+        <command>-fs NAMENODE -rm -r hdfs:///file*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cp: When copying multiple files, destination should be a directory.</expected-output>
+          <expected-output>^cp: `hdfs:///dir': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -2626,12 +2626,12 @@
         <command>-fs NAMENODE -cp hdfs:///file1 hdfs:///file2 hdfs:///file3 hdfs:///file4 hdfs:///dir</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///file*</command>
+        <command>-fs NAMENODE -rm -r hdfs:///file*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cp: When copying multiple files, destination hdfs:///dir should be a directory.</expected-output>
+          <expected-output>^cp: `hdfs:///dir': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -2643,12 +2643,12 @@
         <command>-fs NAMENODE -cp hdfs:///dir0 hdfs:///dir1</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMNEODE -rmr hdfs:///dir1</command>
+        <command>-fs NAMNEODE -rm -r hdfs:///dir1</command>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cp: `hdfs:/dir0': No such file or directory</expected-output>
+          <expected-output>^cp: `hdfs:///dir0': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -2660,10 +2660,10 @@
         <command>-fs NAMENODE -mkdir hdfs:///dir1</command>
 	<command>-fs NAMENODE -touchz hdfs:///dir0/file1</command>
        <command>-fs NAMENODE -cp hdfs:///dir0 hdfs:///dir1</command>
-	<command>-fs NAMENODE -lsr hdfs:///dir*</command>
+	<command>-fs NAMENODE -ls -R hdfs:///dir*</command>
       </test-commands>
       <cleanup-commands>
-	<command>-fs NAMENODE -rmr hdfs:///*</command>
+	<command>-fs NAMENODE -rm -r hdfs:///*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -2689,10 +2689,10 @@
         <command>-fs NAMENODE -mkdir hdfs:///dir2</command>
         <command>-fs NAMENODE -mkdir hdfs:///dest</command>
         <command>-fs NAMENODE -cp hdfs:///dir* hdfs:///dest</command>
-        <command>-fs NAMENODE -lsr hdfs:///d*</command>
+        <command>-fs NAMENODE -ls -R hdfs:///d*</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMNEODE -rmr hdfs:///d*</command>
+        <command>-fs NAMNEODE -rm -r hdfs:///d*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -2718,10 +2718,10 @@
         <command>-fs NAMENODE -mkdir hdfs:///dir2</command>
         <command>-fs NAMENODE -mkdir hdfs:///dest</command>
         <command>-fs NAMENODE -cp hdfs:///dir0 hdfs:///dir1 hdfs:///dir2 hdfs:///dest</command>
-        <command>-fs NAMENODE -lsr hdfs:///d*</command>
+        <command>-fs NAMENODE -ls -R hdfs:///d*</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMNEODE -rmr hdfs:///*</command>
+        <command>-fs NAMNEODE -rm -r hdfs:///*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -2770,7 +2770,7 @@
         <command>-fs NAMENODE -ls NAMENODE/file1 NAMENODE/dir0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/dir0/ NAMENODE/file1</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/dir0/ NAMENODE/file1</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -2793,7 +2793,7 @@
         <command>-fs NAMENODE -ls NAMENODE/file1 NAMENODE/dir0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/dir0/</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/dir0/</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -2815,11 +2815,11 @@
         <command>-fs NAMENODE -touchz NAMENODE/file3</command>
         <command>-fs NAMENODE -mkdir NAMENODE/dir0</command>
         <command>-fs NAMENODE -cp NAMENODE/file* NAMENODE/dir0</command>
-        <command>-fs NAMENODE -lsr NAMENODE/*</command>
+        <command>-fs NAMENODE -ls -R NAMENODE/*</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/file*</command>
-        <command>-fs NAMENODE -rmr NAMENODE/dir0/</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/file*</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/dir0/</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -2857,11 +2857,11 @@
         <command>-fs NAMENODE -touchz NAMENODE/file3</command>
         <command>-fs NAMENODE -mkdir NAMENODE/dir0</command>
         <command>-fs NAMENODE -cp NAMENODE/file1 NAMENODE/file2 NAMENODE/file3 NAMENODE/dir0</command>
-        <command>-fs NAMENODE -lsr NAMENODE/*</command>
+        <command>-fs NAMENODE -ls -R NAMENODE/*</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/file*</command>
-        <command>-fs NAMENODE -rmr NAMENODE/dir0/</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/file*</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/dir0/</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -2917,12 +2917,12 @@
         <command>-fs NAMENODE -cp NAMENODE/file* NAMENODE/file5</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/file*</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/file*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cp: When copying multiple files, destination should be a directory.</expected-output>
+          <expected-output>^cp: `hdfs://\w+[.a-z]*:[0-9]+/file5': Is not a directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -2938,12 +2938,12 @@
         <command>-fs NAMENODE -cp NAMENODE/file1 NAMENODE/file2 NAMENODE/file3 NAMENODE/file4 NAMENODE/file5</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/file*</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/file*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cp: When copying multiple files, destination hdfs://\w+[.a-z]*:[0-9]+/file5 should be a directory.</expected-output>
+          <expected-output>^cp: `hdfs://\w+[.a-z]*:[0-9]+/file5': Is not a directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -2958,12 +2958,12 @@
         <command>-fs NAMENODE -cp NAMENODE/file* NAMENODE/dir</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/file*</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/file*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cp: When copying multiple files, destination should be a directory.</expected-output>
+          <expected-output>^cp: `hdfs://\w+[.a-z]*:[0-9]+/dir': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -2978,12 +2978,12 @@
         <command>-fs NAMENODE -cp NAMENODE/file1 NAMENODE/file2 NAMENODE/file3 NAMENODE/file4 NAMENODE/dir</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/file*</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/file*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cp: When copying multiple files, destination hdfs://\w+[.a-z]*:[0-9]+/dir should be a directory.</expected-output>
+          <expected-output>^cp: `hdfs://\w+[.a-z]*:[0-9]+/dir': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -2995,10 +2995,10 @@
         <command>-fs NAMENODE -mkdir NAMENODE/dir1</command>
         <command>-fs NAMENODE -touchz NAMENODE/dir0/file1</command>
         <command>-fs NAMENODE -cp NAMENODE/dir0 NAMENODE/dir1</command>
-        <command>-fs NAMENODE -lsr NAMENODE/dir*</command>
+        <command>-fs NAMENODE -ls -R NAMENODE/dir*</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/*</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -3024,10 +3024,10 @@
         <command>-fs NAMENODE -mkdir NAMENODE/dir2</command>
         <command>-fs NAMENODE -mkdir NAMENODE/dest</command>
         <command>-fs NAMENODE -cp NAMENODE/dir* NAMENODE/dest</command>
-        <command>-fs NAMENODE -lsr NAMENODE/d*</command>
+        <command>-fs NAMENODE -ls -R NAMENODE/d*</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMNEODE -rmr NAMENODE/d*</command>
+        <command>-fs NAMNEODE -rm -r NAMENODE/d*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -3053,10 +3053,10 @@
         <command>-fs NAMENODE -mkdir NAMENODE/dir2</command>
         <command>-fs NAMENODE -mkdir NAMENODE/dest</command>
         <command>-fs NAMENODE -cp NAMENODE/dir0 NAMENODE/dir1 NAMENODE/dir2 NAMENODE/dest</command>
-        <command>-fs NAMENODE -lsr NAMENODE/d*</command>
+        <command>-fs NAMENODE -ls -R NAMENODE/d*</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMNEODE -rmr NAMENODE/*</command>
+        <command>-fs NAMNEODE -rm -r NAMENODE/*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -3295,7 +3295,7 @@
         <command>-fs NAMENODE -rm hdfs:///dir0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///*</command>
+        <command>-fs NAMENODE -rm -r hdfs:///*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -3410,7 +3410,7 @@
         <command>-fs NAMENODE -rm NAMENODE/dir0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/*</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -3471,13 +3471,13 @@
     
     <!--Tests for rmr-->
     <test> <!-- TESTED -->
-      <description>rmr: removing a file (absolute path) </description>
+      <description>rm: removing a file (absolute path) </description>
       <test-commands>
         <command>-fs NAMENODE -touchz /dir0/file0</command>
-        <command>-fs NAMENODE -rmr /dir0/file0</command>
+        <command>-fs NAMENODE -rm -r /dir0/file0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -3488,13 +3488,13 @@
     </test>
     
     <test> <!-- TESTED -->
-      <description>rmr: removing a file (relative path) </description>
+      <description>rm: removing a file (relative path) </description>
       <test-commands>
         <command>-fs NAMENODE -touchz file0</command>
-        <command>-fs NAMENODE -rmr file0</command>
+        <command>-fs NAMENODE -rm -r file0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -3505,13 +3505,13 @@
     </test>
     
     <test> <!-- TESTED -->
-      <description>rmr: removing a directory (absolute path) </description>
+      <description>rm: removing a directory (absolute path) </description>
       <test-commands>
         <command>-fs NAMENODE -touchz /dir0</command>
-        <command>-fs NAMENODE -rmr /dir0</command>
+        <command>-fs NAMENODE -rm -r /dir0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -3522,13 +3522,13 @@
     </test>
     
     <test> <!-- TESTED -->
-      <description>rmr: removing a directory (relative path) </description>
+      <description>rm: removing a directory (relative path) </description>
       <test-commands>
         <command>-fs NAMENODE -mkdir dir0</command>
-        <command>-fs NAMENODE -rmr dir0</command>
+        <command>-fs NAMENODE -rm -r dir0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -3539,13 +3539,13 @@
     </test>
     
     <test> <!-- TESTED -->
-      <description>rmr: removing directories by globbing (absolute path) </description>
+      <description>rm: removing directories by globbing (absolute path) </description>
       <test-commands>
         <command>-fs NAMENODE -mkdir /dir0</command>
         <command>-fs NAMENODE -mkdir /dir1</command>
         <command>-fs NAMENODE -mkdir /dir2</command>
         <command>-fs NAMENODE -mkdir /dir3</command>
-        <command>-fs NAMENODE -rmr /dir*</command>
+        <command>-fs NAMENODE -rm -r /dir*</command>
       </test-commands>
       <cleanup-commands>
         <command>-fs NAMENODE -rm /user</command>
@@ -3571,13 +3571,13 @@
     </test>
     
     <test> <!-- TESTED -->
-      <description>rmr: removing directories by globbing (relative path) </description>
+      <description>rm: removing directories by globbing (relative path) </description>
       <test-commands>
         <command>-fs NAMENODE -mkdir dir0</command>
         <command>-fs NAMENODE -mkdir dir1</command>
         <command>-fs NAMENODE -mkdir dir2</command>
         <command>-fs NAMENODE -mkdir dir3</command>
-        <command>-fs NAMENODE -rmr dir*</command>
+        <command>-fs NAMENODE -rm -r dir*</command>
       </test-commands>
       <cleanup-commands>
         <command>-fs NAMENODE -rm /user</command>
@@ -3603,45 +3603,45 @@
     </test>
     
     <test> <!--TESTED-->
-      <description>rmr: removing a nonexistent file (absolute path) </description>
+      <description>rm: removing a nonexistent file (absolute path) </description>
       <test-commands>
-        <command>-fs NAMENODE -rmr /dir0/file0</command>
+        <command>-fs NAMENODE -rm -r /dir0/file0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^rmr: `/dir0/file0': No such file or directory</expected-output>
+          <expected-output>^rm: `/dir0/file0': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
     
     <test> <!-- TESTED -->
-      <description>rmr: removing a nonexistent file (relative path) </description>
+      <description>rm: removing a nonexistent file (relative path) </description>
       <test-commands>
-        <command>-fs NAMENODE -rmr file0</command>
+        <command>-fs NAMENODE -rm -r file0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^rmr: `file0': No such file or directory</expected-output>
+          <expected-output>^rm: `file0': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
 
     <test> <!-- TESTED -->
-      <description>rmr: removing a file in hdfs:// path </description>
+      <description>rm: removing a file in hdfs:// path </description>
       <test-commands>
         <command>-fs NAMENODE -touchz hdfs:///file0</command>
-        <command>-fs NAMENODE -rmr hdfs:///file0</command>
+        <command>-fs NAMENODE -rm -r hdfs:///file0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///*</command>
+        <command>-fs NAMENODE -rm -r hdfs:///*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -3652,13 +3652,13 @@
     </test>
     
     <test> <!-- TESTED -->
-      <description>rmr: removing a directory in hdfs:// path </description>
+      <description>rm: removing a directory in hdfs:// path </description>
       <test-commands>
         <command>-fs NAMENODE -touchz hdfs:///dir0</command>
-        <command>-fs NAMENODE -rmr hdfs:///dir0</command>
+        <command>-fs NAMENODE -rm -r hdfs:///dir0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///*</command>
+        <command>-fs NAMENODE -rm -r hdfs:///*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -3669,16 +3669,16 @@
     </test>
     
     <test> <!-- TESTED -->
-      <description>rmr: removing directories by globbing in hdfs:// path </description>
+      <description>rm: removing directories by globbing in hdfs:// path </description>
       <test-commands>
         <command>-fs NAMENODE -mkdir hdfs:///dir0</command>
         <command>-fs NAMENODE -mkdir hdfs:///dir1</command>
         <command>-fs NAMENODE -mkdir hdfs:///dir2</command>
         <command>-fs NAMENODE -mkdir hdfs:///dir3</command>
-        <command>-fs NAMENODE -rmr hdfs:///dir*</command>
+        <command>-fs NAMENODE -rm -r hdfs:///dir*</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///*</command>
+        <command>-fs NAMENODE -rm -r hdfs:///*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -3701,32 +3701,32 @@
     </test>
     
     <test> <!--TESTED-->
-      <description>rmr: removing a nonexistent file or directory in hdfs:// path </description>
+      <description>rm: removing a nonexistent file or directory in hdfs:// path </description>
       <test-commands>
-        <command>-fs NAMENODE -rmr hdfs:///file0</command>
+        <command>-fs NAMENODE -rm -r hdfs:///file0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///*</command>
+        <command>-fs NAMENODE -rm -r hdfs:///*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^rmr: `hdfs:///file0': No such file or directory</expected-output>
+          <expected-output>^rm: `hdfs:///file0': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
     
    <test> <!-- TESTED -->
-      <description>rmr: removing directories without globbing in hdfs:// path </description>
+      <description>rm: removing directories without globbing in hdfs:// path </description>
       <test-commands>
         <command>-fs NAMENODE -mkdir hdfs:///dir0</command>
         <command>-fs NAMENODE -mkdir hdfs:///dir1</command>
         <command>-fs NAMENODE -mkdir hdfs:///dir2</command>
         <command>-fs NAMENODE -mkdir hdfs:///dir3</command>
-        <command>-fs NAMENODE -rmr hdfs:///dir0 hdfs:///dir1 hdfs:///dir2 hdfs:///dir3</command>
+        <command>-fs NAMENODE -rm -r hdfs:///dir0 hdfs:///dir1 hdfs:///dir2 hdfs:///dir3</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///*</command>
+        <command>-fs NAMENODE -rm -r hdfs:///*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -3749,13 +3749,13 @@
     </test>
 
     <test> <!-- TESTED -->
-      <description>rmr: Test for Namenode's path - removing a file</description>
+      <description>rm: Test for Namenode's path - removing a file</description>
       <test-commands>
         <command>-fs NAMENODE -touchz NAMENODE/file0</command>
-        <command>-fs NAMENODE -rmr NAMENODE/file0</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/file0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/*</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -3766,13 +3766,13 @@
     </test>
 
     <test> <!-- TESTED -->
-      <description>rmr: Test for Namenode's path - removing a directory</description>
+      <description>rm: Test for Namenode's path - removing a directory</description>
       <test-commands>
         <command>-fs NAMENODE -touchz NAMENODE/dir0</command>
-        <command>-fs NAMENODE -rmr NAMENODE/dir0</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/dir0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/*</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -3783,16 +3783,16 @@
     </test>
 
     <test> <!-- TESTED -->
-      <description>rmr: removing directories by globbing in Namenode's path </description>
+      <description>rm: removing directories by globbing in Namenode's path </description>
       <test-commands>
         <command>-fs NAMENODE -mkdir NAMENODE/dir0</command>
         <command>-fs NAMENODE -mkdir NAMENODE/dir1</command>
         <command>-fs NAMENODE -mkdir NAMENODE/dir2</command>
         <command>-fs NAMENODE -mkdir NAMENODE/dir3</command>
-        <command>-fs NAMENODE -rmr NAMENODE/dir*</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/dir*</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/*</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -3815,32 +3815,32 @@
     </test>
 
     <test> <!--TESTED-->
-      <description>rmr: removing a nonexistent file or directory in Namenode's path </description>
+      <description>rm: removing a nonexistent file or directory in Namenode's path </description>
       <test-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/file0</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/file0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/*</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^rmr: `hdfs://\w+[.a-z]*:[0-9]*/file0': No such file or directory</expected-output>
+          <expected-output>^rm: `hdfs://\w+[.a-z]*:[0-9]*/file0': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
 
     <test> <!-- TESTED -->
-      <description>rmr: removing directories without globbing in Namenode's path </description>
+      <description>rm: removing directories without globbing in Namenode's path </description>
       <test-commands>
         <command>-fs NAMENODE -mkdir NAMENODE/dir0</command>
         <command>-fs NAMENODE -mkdir NAMENODE/dir1</command>
         <command>-fs NAMENODE -mkdir NAMENODE/dir2</command>
         <command>-fs NAMENODE -mkdir NAMENODE/dir3</command>
-        <command>-fs NAMENODE -rmr NAMENODE/dir0 NAMENODE/dir1 NAMENODE/dir2 NAMENODE/dir3</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/dir0 NAMENODE/dir1 NAMENODE/dir2 NAMENODE/dir3</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/*</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -3890,7 +3890,7 @@
         <command>-fs NAMENODE -du data15bytes</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -3907,7 +3907,7 @@
         <command>-fs NAMENODE -du /dir0/dir1/data</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /dir0</command>
+        <command>-fs NAMENODE -rm -r /dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -3940,7 +3940,7 @@
         <command>-fs NAMENODE -du dir0/dir1/data</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -3974,7 +3974,7 @@
         <command>-fs NAMENODE -du /dir0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -3996,7 +3996,7 @@
         <command>-fs NAMENODE -du dir0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -4016,7 +4016,7 @@
         <command>-fs NAMENODE -put /user/wrongdata file</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -4032,7 +4032,7 @@
         <command>-fs NAMENODE -put wrongdata file</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -4049,12 +4049,12 @@
         <command>-fs NAMENODE -put CLITEST_DATA/data15bytes /user/file0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>put: Target /user/file0 already exists</expected-output>
+          <expected-output>put: `/user/file0': File exists</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4066,12 +4066,12 @@
         <command>-fs NAMENODE -put CLITEST_DATA/data15bytes file0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>put: Target file0 already exists</expected-output>
+          <expected-output>put: `file0': File exists</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4085,12 +4085,12 @@
         <command>-fs NAMENODE -put /data15bytes /data30bytes file0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^put: copying multiple files, but last argument `file0' is not a directory</expected-output>
+          <expected-output>^put: `file0': Is not a directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4103,7 +4103,7 @@
         <command>-fs NAMENODE -put /data15bytes /data30bytes wrongdir</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -4137,7 +4137,7 @@
         <command>-fs NAMENODE -du hdfs:///dir1/data</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///dir1/data</command>
+        <command>-fs NAMENODE -rm -r hdfs:///dir1/data</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -4171,7 +4171,7 @@
         <command>-fs NAMENODE -du hdfs:///dir0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///dir0</command>
+        <command>-fs NAMENODE -rm -r hdfs:///dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -4191,7 +4191,7 @@
         <command>-fs NAMENODE -put /user/wrongdata hdfs:///file</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///*</command>
+        <command>-fs NAMENODE -rm -r hdfs:///*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -4208,12 +4208,12 @@
         <command>-fs NAMENODE -put CLITEST_DATA/data15bytes hdfs:///user/file0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///user</command>
+        <command>-fs NAMENODE -rm -r hdfs:///user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>put: Target hdfs:/user/file0 already exists</expected-output>
+          <expected-output>put: `hdfs:///user/file0': File exists</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4225,12 +4225,12 @@
         <command>-fs NAMENODE -put CLITEST_DATA/data15bytes CLITEST_DATA/data30bytes hdfs:///file0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///*</command>
+        <command>-fs NAMENODE -rm -r hdfs:///*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^put: copying multiple files, but last argument `hdfs:/file0' is not a directory</expected-output>
+          <expected-output>^put: `hdfs:///file0': Is not a directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4241,12 +4241,12 @@
         <command>-fs NAMENODE -put CLITEST_DATA/data15bytes CLITEST_DATA/data30bytes hdfs:///wrongdir</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///*</command>
+        <command>-fs NAMENODE -rm -r hdfs:///*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^put: `hdfs:/wrongdir': No such file or directory</expected-output>
+          <expected-output>^put: `hdfs:///wrongdir': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4275,7 +4275,7 @@
         <command>-fs NAMENODE -du NAMENODE/dir1/data</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/dir1/data</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/dir1/data</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -4309,7 +4309,7 @@
         <command>-fs NAMENODE -du NAMENODE/dir0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/dir0</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -4329,7 +4329,7 @@
         <command>-fs NAMENODE -put /user/wrongdata NAMENODE/file</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/*</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -4346,12 +4346,12 @@
         <command>-fs NAMENODE -put CLITEST_DATA/data15bytes NAMENODE/user/file0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/user</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^put: Target hdfs://\w+[.a-z]*:[0-9]+/user/file0 already exists</expected-output>
+          <expected-output>^put: `hdfs://\w+[.a-z]*:[0-9]+/user/file0': File exists</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4363,12 +4363,12 @@
         <command>-fs NAMENODE -put CLITEST_DATA/data15bytes CLITEST_DATA/data30bytes NAMENODE/file0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/*</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^put: copying multiple files, but last argument `hdfs://\w+[.a-z]*:[0-9]+/file0' is not a directory</expected-output>
+          <expected-output>^put: `hdfs://\w+[.a-z]*:[0-9]+/file0': Is not a directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4379,7 +4379,7 @@
         <command>-fs NAMENODE -put CLITEST_DATA/data15bytes CLITEST_DATA/data30bytes NAMENODE/wrongdir</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/*</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -4414,7 +4414,7 @@
         <command>-fs NAMENODE -du data15bytes</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -4431,7 +4431,7 @@
         <command>-fs NAMENODE -du /dir0/dir1/data</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /dir0</command>
+        <command>-fs NAMENODE -rm -r /dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -4460,7 +4460,7 @@
         <command>-fs NAMENODE -du dir0/dir1/data</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -4490,7 +4490,7 @@
         <command>-fs NAMENODE -du /dir0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -4512,7 +4512,7 @@
         <command>-fs NAMENODE -du dir0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -4532,7 +4532,7 @@
         <command>-fs NAMENODE -copyFromLocal /user/wrongdata file</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -4548,7 +4548,7 @@
         <command>-fs NAMENODE -copyFromLocal wrongdata file</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -4565,12 +4565,12 @@
         <command>-fs NAMENODE -copyFromLocal CLITEST_DATA/data15bytes /user/file0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>copyFromLocal: Target /user/file0 already exists</expected-output>
+          <expected-output>copyFromLocal: `/user/file0': File exists</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4582,12 +4582,12 @@
         <command>-fs NAMENODE -copyFromLocal CLITEST_DATA/data15bytes file0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>copyFromLocal: Target file0 already exists</expected-output>
+          <expected-output>copyFromLocal: `file0': File exists</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4601,12 +4601,12 @@
         <command>-fs NAMENODE -copyFromLocal /data15bytes /data30bytes file0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^copyFromLocal: copying multiple files, but last argument `file0' is not a directory</expected-output>
+          <expected-output>^copyFromLocal: `file0': Is not a directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4619,7 +4619,7 @@
         <command>-fs NAMENODE -copyFromLocal /data15bytes /data30bytes wrongdir</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -4656,7 +4656,7 @@
         <command>-fs NAMENODE -du hdfs:///dir0/dir1/data/data15bytes</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///dir0</command>
+        <command>-fs NAMENODE -rm -r hdfs:///dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -4674,7 +4674,7 @@
         <command>-fs NAMENODE -du hdfs:///dir0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///dir0</command>
+        <command>-fs NAMENODE -rm -r hdfs:///dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -4694,7 +4694,7 @@
         <command>-fs NAMENODE -copyFromLocal /user/wrongdata hdfs:///file</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///*</command>
+        <command>-fs NAMENODE -rm -r hdfs:///*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -4711,12 +4711,12 @@
         <command>-fs NAMENODE -copyFromLocal CLITEST_DATA/data15bytes hdfs:///user/file0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///user</command>
+        <command>-fs NAMENODE -rm -r hdfs:///user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>copyFromLocal: Target hdfs:/user/file0 already exists</expected-output>
+          <expected-output>copyFromLocal: `hdfs:///user/file0': File exists</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4728,12 +4728,12 @@
         <command>-fs NAMENODE -copyFromLocal CLITEST_DATA/data15bytes CLITEST_DATA/data30bytes hdfs:///file0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///*</command>
+        <command>-fs NAMENODE -rm -r hdfs:///*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^copyFromLocal: copying multiple files, but last argument `hdfs:/file0' is not a directory</expected-output>
+          <expected-output>^copyFromLocal: `hdfs:///file0': Is not a directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4744,12 +4744,12 @@
         <command>-fs NAMENODE -copyFromLocal CLITEST_DATA/data15bytes CLITEST_DATA/data30bytes hdfs:///wrongdir</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///*</command>
+        <command>-fs NAMENODE -rm -r hdfs:///*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^copyFromLocal: `hdfs:/wrongdir': No such file or directory</expected-output>
+          <expected-output>^copyFromLocal: `hdfs:///wrongdir': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4782,7 +4782,7 @@
         <command>-fs NAMENODE -du NAMENODE/dir0/dir1/data/data15bytes</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/dir0</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -4800,7 +4800,7 @@
         <command>-fs NAMENODE -du NAMENODE/dir0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/dir0</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -4820,7 +4820,7 @@
         <command>-fs NAMENODE -copyFromLocal /user/wrongdata NAMENODE/file</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/*</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -4837,12 +4837,12 @@
         <command>-fs NAMENODE -copyFromLocal CLITEST_DATA/data15bytes NAMENODE/user/file0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/user</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>copyFromLocal: Target hdfs://\w+[.a-z]*:[0-9]+/user/file0 already exists</expected-output>
+          <expected-output>copyFromLocal: `hdfs://\w+[.a-z]*:[0-9]+/user/file0': File exists</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4854,12 +4854,12 @@
         <command>-fs NAMENODE -copyFromLocal CLITEST_DATA/data15bytes CLITEST_DATA/data30bytes NAMENODE/file0</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/*</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^copyFromLocal: copying multiple files, but last argument `hdfs://\w+[.a-z]*:[0-9]+/file0' is not a directory</expected-output>
+          <expected-output>^copyFromLocal: `hdfs://\w+[.a-z]*:[0-9]+/file0': Is not a directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4870,7 +4870,7 @@
         <command>-fs NAMENODE -copyFromLocal CLITEST_DATA/data15bytes CLITEST_DATA/data30bytes NAMENODE/wrongdir</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/*</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -4887,7 +4887,7 @@
         <command>-fs NAMENODE -get /user/file CLITEST_DATA/file</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -4903,7 +4903,7 @@
         <command>-fs NAMENODE -get file CLITEST_DATA/file</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -4919,7 +4919,7 @@
         <command>-fs NAMENODE -get hdfs:///user/file CLITEST_DATA/file</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///user</command>
+        <command>-fs NAMENODE -rm -r hdfs:///user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -4935,7 +4935,7 @@
         <command>-fs NAMENODE -get NAMENODE/user/file CLITEST_DATA/file</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/user</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -4973,7 +4973,7 @@
         <command>-fs NAMENODE -cat data15bytes</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr  /user</command>
+        <command>-fs NAMENODE -rm -r  /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -4994,7 +4994,7 @@
         <command>-fs NAMENODE -cat /dir0/data*</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /dir0</command>
+        <command>-fs NAMENODE -rm -r /dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -5015,7 +5015,7 @@
         <command>-fs NAMENODE -cat dir0/data*</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -5036,7 +5036,7 @@
         <command>-fs NAMENODE -cat /dir0/data15bytes /dir0/data30bytes /dir0/data60bytes /dir0/data120bytes</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /dir0</command>
+        <command>-fs NAMENODE -rm -r /dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -5057,7 +5057,7 @@
         <command>-fs NAMENODE -cat dir0/data15bytes dir0/data30bytes dir0/data60bytes dir0/data120bytes</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -5105,7 +5105,7 @@
         <command>-fs NAMENODE -cat /dir1</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /dir1</command>
+        <command>-fs NAMENODE -rm -r /dir1</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -5122,7 +5122,7 @@
         <command>-fs NAMENODE -cat dir1</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr dir1</command>
+        <command>-fs NAMENODE -rm -r dir1</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -5160,7 +5160,7 @@
         <command>-fs NAMENODE -cat hdfs:///dir0/data*</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///dir0</command>
+        <command>-fs NAMENODE -rm -r hdfs:///dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -5181,7 +5181,7 @@
         <command>-fs NAMENODE -cat hdfs:///dir0/data15bytes hdfs:///dir0/data30bytes hdfs:///dir0/data60bytes hdfs:///dir0/data120bytes</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///dir0</command>
+        <command>-fs NAMENODE -rm -r hdfs:///dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -5213,7 +5213,7 @@
         <command>-fs NAMENODE -cat hdfs:///dir1</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///dir1</command>
+        <command>-fs NAMENODE -rm -r hdfs:///dir1</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -5252,7 +5252,7 @@
         <command>-fs NAMENODE -cat NAMENODE/dir0/data*</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/dir0</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -5273,7 +5273,7 @@
         <command>-fs NAMENODE -cat NAMENODE/dir0/data15bytes NAMENODE/dir0/data30bytes NAMENODE/dir0/data60bytes NAMENODE/dir0/data120bytes</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/dir0</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/dir0</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -5305,7 +5305,7 @@
         <command>-fs NAMENODE -cat NAMENODE/dir1</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/dir1</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/dir1</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -5322,7 +5322,7 @@
         <command>-fs NAMENODE -copyToLocal file CLITEST_DATA/file</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -5338,7 +5338,7 @@
         <command>-fs NAMENODE -copyToLocal /user/file CLITEST_DATA/file</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr /user</command>
+        <command>-fs NAMENODE -rm -r /user</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -5354,7 +5354,7 @@
         <command>-fs NAMENODE -copyToLocal hdfs:///file CLITEST_DATA/file</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr hdfs:///*</command>
+        <command>-fs NAMENODE -rm -r hdfs:///*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -5370,7 +5370,7 @@
         <command>-fs NAMENODE -copyToLocal NAMENODE/file CLITEST_DATA/file</command>
       </test-commands>
       <cleanup-commands>
-        <command>-fs NAMENODE -rmr NAMENODE/*</command>
+        <command>-fs NAMENODE -rm -r NAMENODE/*</command>
       </cleanup-commands>
       <comparators>
         <comparator>
@@ -5388,7 +5388,7 @@
       <description>mkdir: creating directory (absolute path) </description>
       <test-commands>
         <command>-fs NAMENODE -mkdir /dir0</command>
-        <command>-fs NAMENODE -dus /dir0</command>
+        <command>-fs NAMENODE -du -s /dir0</command>
       </test-commands>
       <cleanup-commands>
         <command>-fs NAMENODE -rm /user</command>
@@ -5405,7 +5405,7 @@
       <description>mkdir: creating directory (relative path) </description>
       <test-commands>
         <command>-fs NAMENODE -mkdir dir0 </command>
-        <command>-fs NAMENODE -dus dir0</command>
+        <command>-fs NAMENODE -du -s dir0</command>
       </test-commands>
       <cleanup-commands>
         <command>-fs NAMENODE -rm /user</command>
@@ -5425,7 +5425,7 @@
         <command>-fs NAMENODE -mkdir /dir1 </command>        
         <command>-fs NAMENODE -mkdir /dir2 </command>
         <command>-fs NAMENODE -mkdir /dir3 </command>
-        <command>-fs NAMENODE -dus /dir*</command>
+        <command>-fs NAMENODE -du -s /dir*</command>
       </test-commands>
       <cleanup-commands>
         <command>-fs NAMENODE -rm /dir*</command>
@@ -5457,7 +5457,7 @@
         <command>-fs NAMENODE -mkdir dir1 </command>
         <command>-fs NAMENODE -mkdir dir2 </command>
         <command>-fs NAMENODE -mkdir dir3 </command>
-        <command>-fs NAMENODE -dus dir*</command>

[... 2573 lines stripped ...]


Mime
View raw message