hadoop-hdfs-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From szets...@apache.org
Subject svn commit: r1102005 - in /hadoop/hdfs/trunk: CHANGES.txt src/test/hdfs/org/apache/hadoop/cli/testHDFSConf.xml src/test/hdfs/org/apache/hadoop/hdfs/TestDFSShell.java
Date Wed, 11 May 2011 18:07:07 GMT
Author: szetszwo
Date: Wed May 11 18:07:07 2011
New Revision: 1102005

URL: http://svn.apache.org/viewvc?rev=1102005&view=rev
Log:
HDFS-1912. Update tests for FsShell standardized error messages.  Contributed by Daryn Sharp

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

Modified: hadoop/hdfs/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=1102005&r1=1102004&r2=1102005&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Wed May 11 18:07:07 2011
@@ -532,6 +532,9 @@ Trunk (unreleased changes)
     HDFS-1908. Fix a NullPointerException in fi.DataTransferTestUtil.
     (szetszwo)
 
+    HDFS-1912. Update tests for FsShell standardized error messages.
+    (Daryn Sharp via szetszwo)
+
 Release 0.22.0 - Unreleased
 
   NEW FEATURES

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=1102005&r1=1102004&r2=1102005&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 Wed May 11 18:07:07 2011
@@ -189,7 +189,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^ls: Cannot access /file1: No such file or directory.</expected-output>
+          <expected-output>^ls: `/file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -204,7 +204,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^ls: Cannot access /user: No such file or directory.</expected-output>
+          <expected-output>^ls: `/user': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -420,7 +420,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^ls: Cannot access hdfs:///file1: No such file or directory.</expected-output>
+          <expected-output>^ls: `hdfs:///file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -436,7 +436,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^ls: Cannot access 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>
@@ -718,7 +718,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^lsr: Cannot access /file1: No such file or directory.</expected-output>
+          <expected-output>^lsr: `/file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -733,7 +733,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^lsr: Cannot access /user: No such file or directory.</expected-output>
+          <expected-output>^lsr: `/user': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -810,7 +810,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^lsr: Cannot access hdfs:///file1: No such file or directory.</expected-output>
+          <expected-output>^lsr: `hdfs:///file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -887,7 +887,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^lsr: Cannot access hdfs://\w+[.a-z]*:[0-9]+/file1: No such file or directory.</expected-output>
+          <expected-output>^lsr: `hdfs://\w+[.a-z]*:[0-9]+/file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1647,7 +1647,7 @@
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>ls: Cannot access /file1: No such file or directory.</expected-output>
+          <expected-output>ls: `/file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1681,7 +1681,7 @@
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>ls: Cannot access /file1: No such file or directory.</expected-output>
+          <expected-output>ls: `/file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1730,7 +1730,7 @@
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>ls: Cannot access /file*: No such file or directory.</expected-output>
+          <expected-output>ls: `/file*': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1816,7 +1816,7 @@
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>ls: Cannot access hdfs:///file*: No such file or directory.</expected-output>
+          <expected-output>ls: `hdfs:///file*': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1831,7 +1831,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>
@@ -1865,7 +1865,7 @@
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>ls: Cannot access hdfs:///file1: No such file or directory.</expected-output>
+          <expected-output>ls: `hdfs:///file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1909,7 +1909,7 @@
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>ls: Cannot access hdfs:///file*: No such file or directory.</expected-output>
+          <expected-output>ls: `hdfs:///file*': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1969,7 +1969,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^ls: Cannot access 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>
@@ -1984,7 +1984,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^mv: hdfs://\w+[.a-z]*:[0-9]+/file1: No such file or directory</expected-output>
+          <expected-output>^mv: `hdfs://\w+[.a-z]*:[0-9]+/file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -2018,7 +2018,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^ls: Cannot access 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>
@@ -2062,7 +2062,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^ls: Cannot access hdfs:\/\/\w+[.a-z]*:[0-9]+\/file\*: No such file or directory.</expected-output>
+          <expected-output>^ls: `hdfs://\w+[.a-z]*:[0-9]+/file\*': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -2361,7 +2361,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cp: File does not exist: /file</expected-output>
+          <expected-output>^cp: `/file': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -2377,7 +2377,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cp: File does not exist: file1</expected-output>
+          <expected-output>^cp: `file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -2626,7 +2626,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cp: File does not exist: hdfs:/file</expected-output>
+          <expected-output>^cp: `hdfs:/file': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -2725,7 +2725,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cp: File does not exist: hdfs:/dir0</expected-output>
+          <expected-output>^cp: `hdfs:/dir0': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -2978,7 +2978,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cp: File does not exist: hdfs://\w+[.a-z]*:[0-9]+/file</expected-output>
+          <expected-output>^cp: `hdfs://\w+[.a-z]*:[0-9]+/file': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3279,7 +3279,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^rm: cannot remove dir0: No such file or directory.</expected-output>
+          <expected-output>^rm: `dir0': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3295,7 +3295,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^rm: cannot remove /dir0/file0: No such file or directory.</expected-output>
+          <expected-output>^rm: `/dir0/file0': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3311,7 +3311,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^rm: cannot remove file0: No such file or directory.</expected-output>
+          <expected-output>^rm: `file0': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3394,7 +3394,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^rm: cannot remove hdfs:/file0: No such file or directory.</expected-output>
+          <expected-output>^rm: `hdfs:/file0': No such file or directory</expected-output>
         </comparator>
      </comparators>
     </test>
@@ -3492,7 +3492,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>rm: cannot remove hdfs://\w+[.a-z]*:[0-9]*/dir0: No such file or directory.</expected-output>
+          <expected-output>rm: `hdfs://\w+[.a-z]*:[0-9]*/dir0': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3509,7 +3509,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^rm: cannot remove 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>
@@ -3690,7 +3690,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^rmr: cannot remove /dir0/file0: No such file or directory.</expected-output>
+          <expected-output>^rmr: `/dir0/file0': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3706,7 +3706,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^rmr: cannot remove file0: No such file or directory.</expected-output>
+          <expected-output>^rmr: `file0': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3788,7 +3788,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^rmr: cannot remove hdfs:/file0: No such file or directory.</expected-output>
+          <expected-output>^rmr: `hdfs:/file0': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -3902,7 +3902,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^rmr: cannot remove hdfs://\w+[.a-z]*:[0-9]*/file0: No such file or directory.</expected-output>
+          <expected-output>^rmr: `hdfs://\w+[.a-z]*:[0-9]*/file0': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4106,7 +4106,7 @@
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>put: File /user/wrongdata does not exist</expected-output>
+          <expected-output>put: `/user/wrongdata': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4122,7 +4122,7 @@
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>put: File wrongdata does not exist</expected-output>
+          <expected-output>put: `wrongdata': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4193,7 +4193,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^put: `wrongdir': specified destination directory doest not exist</expected-output>
+          <expected-output>^put: `wrongdir': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4285,7 +4285,7 @@
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>put: File /user/wrongdata does not exist</expected-output>
+          <expected-output>put: `/user/wrongdata': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4335,7 +4335,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^put: `hdfs:/wrongdir': specified destination directory doest not exist</expected-output>
+          <expected-output>^put: `hdfs:/wrongdir': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4427,7 +4427,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^put: File /user/wrongdata does not exist.</expected-output>
+          <expected-output>^put: `/user/wrongdata': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4477,7 +4477,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^put: `hdfs://\w+[.a-z]*:[0-9]+/wrongdir': specified destination directory doest not exist</expected-output>
+          <expected-output>^put: `hdfs://\w+[.a-z]*:[0-9]+/wrongdir': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4646,7 +4646,7 @@
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>copyFromLocal: File /user/wrongdata does not exist</expected-output>
+          <expected-output>copyFromLocal: `/user/wrongdata': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4662,7 +4662,7 @@
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>copyFromLocal: File wrongdata does not exist</expected-output>
+          <expected-output>copyFromLocal: `wrongdata': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4733,7 +4733,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^copyFromLocal: `wrongdir': specified destination directory doest not exist</expected-output>
+          <expected-output>^copyFromLocal: `wrongdir': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4820,7 +4820,7 @@
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>copyFromLocal: File /user/wrongdata does not exist</expected-output>
+          <expected-output>copyFromLocal: `/user/wrongdata': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4870,7 +4870,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^copyFromLocal: `hdfs:/wrongdir': specified destination directory doest not exist</expected-output>
+          <expected-output>^copyFromLocal: `hdfs:/wrongdir': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -4958,7 +4958,7 @@
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>copyFromLocal: File /user/wrongdata does not exist</expected-output>
+          <expected-output>copyFromLocal: `/user/wrongdata': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5008,7 +5008,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^copyFromLocal: `hdfs://\w+[.a-z]*:[0-9]+/wrongdir': specified destination directory doest not exist</expected-output>
+          <expected-output>^copyFromLocal: `hdfs://\w+[.a-z]*:[0-9]+/wrongdir': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5025,7 +5025,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>get: .*: No such file or directory</expected-output>
+          <expected-output>get: `.*': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5041,7 +5041,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>get: .*: No such file or directory</expected-output>
+          <expected-output>get: `.*': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5057,7 +5057,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>get: .*: No such file or directory</expected-output>
+          <expected-output>get: `.*': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5073,7 +5073,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>get: .*: No such file or directory</expected-output>
+          <expected-output>get: `.*': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5211,7 +5211,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cat: File does not exist: /file</expected-output>
+          <expected-output>^cat: `/file': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5226,7 +5226,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cat: File does not exist: /user/[a-z]*/file</expected-output>
+          <expected-output>^cat: `file': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5243,7 +5243,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cat: File does not exist: /dir1</expected-output>
+          <expected-output>^cat: `/dir1': Is a directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5252,7 +5252,7 @@
       <description>cat: contents of directory(relative path)</description>
       <test-commands>
         <command>-fs NAMENODE -mkdir dir1</command>
-        <command>-fs NAMENODE -cat dir</command>
+        <command>-fs NAMENODE -cat dir1</command>
       </test-commands>
       <cleanup-commands>
         <command>-fs NAMENODE -rmr dir1</command>
@@ -5260,7 +5260,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cat: File does not exist: /user/[a-z]*/dir</expected-output>
+          <expected-output>^cat: `dir1': Is a directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5334,7 +5334,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cat: File does not exist: /file</expected-output>
+          <expected-output>^cat: `hdfs:///file': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5351,7 +5351,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cat: File does not exist: /dir1</expected-output>
+          <expected-output>^cat: `hdfs:///dir1': Is a directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5426,7 +5426,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cat: File does not exist: /file</expected-output>
+          <expected-output>^cat: `hdfs://\w+[.a-z]*:[0-9]*/file': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5443,7 +5443,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^cat: File does not exist: /dir1</expected-output>
+          <expected-output>^cat: `hdfs://\w+[.a-z]*:[0-9]*/dir1': Is a directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5460,7 +5460,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>copyToLocal: .*: No such file or directory</expected-output>
+          <expected-output>copyToLocal: `.*': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5476,7 +5476,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>copyToLocal: .*: No such file or directory</expected-output>
+          <expected-output>copyToLocal: `.*': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5492,7 +5492,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>copyToLocal: .*: No such file or directory</expected-output>
+          <expected-output>copyToLocal: `.*': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5508,7 +5508,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>copyToLocal: .*: No such file or directory</expected-output>
+          <expected-output>copyToLocal: `.*': No such file or directory</expected-output>
         </comparator>
      </comparators>
     </test>
@@ -5627,7 +5627,7 @@
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>mkdir: cannot create directory /dir0: File exists</expected-output>
+          <expected-output>mkdir: `/dir0': File exists</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5644,7 +5644,7 @@
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>mkdir: data15bytes exists but is not a directory</expected-output>
+          <expected-output>mkdir: `data15bytes': Is not a directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5707,7 +5707,7 @@
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>mkdir: cannot create directory hdfs:///dir0: File exists</expected-output>
+          <expected-output>mkdir: `hdfs:///dir0': File exists</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5724,7 +5724,7 @@
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>mkdir: hdfs:///data15bytes exists but is not a directory</expected-output>
+          <expected-output>mkdir: `hdfs:///data15bytes': Is not a directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5787,7 +5787,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>mkdir: cannot create directory hdfs://\w+[.a-z]*:[0-9]+/dir0: File exists</expected-output>
+          <expected-output>mkdir: `hdfs://\w+[.a-z]*:[0-9]+/dir0': File exists</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5804,7 +5804,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>mkdir: hdfs://\w+[.a-z]*:[0-9]+/data15bytes exists but is not a directory</expected-output>
+          <expected-output>mkdir: `hdfs://\w+[.a-z]*:[0-9]+/data15bytes': Is not a directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5899,7 +5899,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^setrep: File does not exist: /dir0/file</expected-output>
+          <expected-output>^setrep: `/dir0/file': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5915,7 +5915,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^setrep: File does not exist: file0</expected-output>
+          <expected-output>^setrep: `file0': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -5970,7 +5970,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^setrep: File does not exist: hdfs:/dir0/file</expected-output>
+          <expected-output>^setrep: `hdfs:///dir0/file': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6025,7 +6025,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^setrep: File does not exist: hdfs://\w+[.a-z]*:[0-9]+/dir0/file</expected-output>
+          <expected-output>^setrep: `hdfs://\w+[.a-z]*:[0-9]+/dir0/file': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6247,7 +6247,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^test: File does not exist: /dir0/file</expected-output>
+          <expected-output>^test: `/dir0/file': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6263,7 +6263,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^test: File does not exist: file</expected-output>
+          <expected-output>^test: `file': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6279,7 +6279,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^test: File does not exist: /dir</expected-output>
+          <expected-output>^test: `/dir': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6295,7 +6295,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^test: File does not exist: dir0</expected-output>
+          <expected-output>^test: `dir0': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6311,7 +6311,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^test: File does not exist: hdfs:/dir0/file</expected-output>
+          <expected-output>^test: `hdfs:///dir0/file': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6327,7 +6327,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^test: File does not exist: hdfs:/dir</expected-output>
+          <expected-output>^test: `hdfs:///dir': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6343,7 +6343,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^test: File does not exist: hdfs://\w+[.a-z]*:[0-9]+/dir0/file</expected-output>
+          <expected-output>^test: `hdfs://\w+[.a-z]*:[0-9]+/dir0/file': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6359,7 +6359,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^test: File does not exist: hdfs://\w+[.a-z]*:[0-9]+/dir</expected-output>
+          <expected-output>^test: `hdfs://\w+[.a-z]*:[0-9]+/dir': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6518,7 +6518,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^stat: cannot stat `/file': No such file or directory</expected-output>
+          <expected-output>^stat: `/file': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6533,7 +6533,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^stat: cannot stat `file1': No such file or directory</expected-output>
+          <expected-output>^stat: `file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6620,7 +6620,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^stat: cannot stat `hdfs:///file': No such file or directory</expected-output>
+          <expected-output>^stat: `hdfs:///file': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6707,7 +6707,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^stat: cannot stat `hdfs://\w+[.a-z]*:[0-9]+/file': No such file or directory</expected-output>
+          <expected-output>^stat: `hdfs://\w+[.a-z]*:[0-9]+/file': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6762,7 +6762,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^tail: File does not exist: /file\*</expected-output>
+          <expected-output>^tail: `/file\*': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6782,7 +6782,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^tail: File does not exist: file\*</expected-output>
+          <expected-output>^tail: `file\*': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6797,7 +6797,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^tail: File does not exist: /file</expected-output>
+          <expected-output>^tail: `/file': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6812,7 +6812,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^tail: File does not exist: file1</expected-output>
+          <expected-output>^tail: `file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6829,7 +6829,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^tail: Source must be a file.</expected-output>
+          <expected-output>^tail: `/dir1': Is a directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6846,7 +6846,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^tail: Source must be a file.</expected-output>
+          <expected-output>^tail: `dir1': Is a directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6883,7 +6883,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^tail: File does not exist: hdfs:/file\*</expected-output>
+          <expected-output>^tail: `hdfs:///file\*': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6898,7 +6898,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^tail: File does not exist: hdfs:/file</expected-output>
+          <expected-output>^tail: `hdfs:///file': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6915,7 +6915,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^tail: Source must be a file.</expected-output>
+          <expected-output>^tail: `hdfs:///dir1': Is a directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6952,7 +6952,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^tail: File does not exist: hdfs://\w+[.a-z]*:[0-9]+/file\*</expected-output>
+          <expected-output>^tail: `hdfs://\w+[.a-z]*:[0-9]+/file\*': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6967,7 +6967,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^tail: File does not exist: hdfs://\w+[.a-z]*:[0-9]+/file</expected-output>
+          <expected-output>^tail: `hdfs://\w+[.a-z]*:[0-9]+/file': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -6984,7 +6984,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^tail: Source must be a file.</expected-output>
+          <expected-output>^tail: `hdfs://\w+[.a-z]*:[0-9]+/dir1': Is a directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7068,7 +7068,7 @@
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>count: Can not find listing for /file1</expected-output>
+          <expected-output>count: `/file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7083,7 +7083,7 @@
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>count: Can not find listing for file1</expected-output>
+          <expected-output>count: `file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7426,7 +7426,7 @@
       <comparators>
         <comparator>
          <type>TokenComparator</type>
-          <expected-output>count: Can not find listing for /file1</expected-output>
+          <expected-output>count: `/file1': No such file or directory</expected-output>
        </comparator>
      </comparators>
    </test>
@@ -7441,7 +7441,7 @@
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>count: Can not find listing for file1</expected-output>
+          <expected-output>count: `file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7778,7 +7778,7 @@
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>count: Can not find listing for hdfs:/file1</expected-output>
+          <expected-output>count: `hdfs:///file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -7957,7 +7957,7 @@
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>count: Can not find listing for hdfs:/file1</expected-output>
+          <expected-output>count: `hdfs:///file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -8150,7 +8150,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>count: Can not find listing for hdfs://\w+[.a-z]*:[0-9]+/file1</expected-output>
+          <expected-output>count: `hdfs://\w+[.a-z]*:[0-9]+/file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -8329,7 +8329,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>count: Can not find listing for hdfs://\w+[.a-z]*:[0-9]+/file1</expected-output>
+          <expected-output>count: `hdfs://\w+[.a-z]*:[0-9]+/file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -8850,7 +8850,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^chmod: could not get status for '/file1': File does not exist: /file1</expected-output>
+          <expected-output>^chmod: `/file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -8866,7 +8866,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^chmod: could not get status for 'file1': File does not exist: file1</expected-output>
+          <expected-output>^chmod: `file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -8882,7 +8882,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^chmod: could not get status for '/file1': File does not exist: /file1</expected-output>
+          <expected-output>^chmod: `/file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -8898,7 +8898,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^chmod: could not get status for 'file1': File does not exist: file1</expected-output>
+          <expected-output>^chmod: `file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -10306,7 +10306,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^chmod: could not get status for 'hdfs:/file1': File does not exist: hdfs:/file1</expected-output>
+          <expected-output>^chmod: `hdfs:///file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -10322,7 +10322,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^chmod: could not get status for 'hdfs:/file1': File does not exist: hdfs:/file1</expected-output>
+          <expected-output>^chmod: `hdfs:///file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -11125,7 +11125,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^chmod: could not get status for 'hdfs://\w+[.a-z]*:[0-9]+/file1': File does not exist: hdfs://\w+[.a-z]*:[0-9]+/file1</expected-output>
+          <expected-output>^chmod: `hdfs://\w+[.a-z]*:[0-9]+/file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -11141,7 +11141,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^chmod: could not get status for 'hdfs://\w+[.a-z]*:[0-9]+/file1': File does not exist: hdfs://\w+[.a-z]*:[0-9]+/file1</expected-output>
+          <expected-output>^chmod: `hdfs://\w+[.a-z]*:[0-9]+/file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -11854,7 +11854,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^chown: could not get status for 'hdfs:/file1': File does not exist: hdfs:/file1</expected-output>
+          <expected-output>^chown: `hdfs:///file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -12371,7 +12371,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^chown: could not get status for '/file1': File does not exist: /file1</expected-output>
+          <expected-output>^chown: `/file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -12387,7 +12387,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^chown: could not get status for 'file1': File does not exist: file1</expected-output>
+          <expected-output>^chown: `file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -13133,7 +13133,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^chown: could not get status for 'hdfs://\w+[.a-z]*:[0-9]+/file1': File does not exist: hdfs://\w+[.a-z]*:[0-9]+/file1</expected-output>
+          <expected-output>^chown: `hdfs://\w+[.a-z]*:[0-9]+/file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -13650,7 +13650,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^chgrp: could not get status for '/file1': File does not exist: /file1</expected-output>
+          <expected-output>^chgrp: `/file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -13666,7 +13666,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^chgrp: could not get status for 'file1': File does not exist: file1</expected-output>
+          <expected-output>^chgrp: `file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -14378,7 +14378,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^chgrp: could not get status for 'hdfs:/file1': File does not exist: hdfs:/file1</expected-output>
+          <expected-output>^chgrp: `hdfs:///file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -14788,7 +14788,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^chgrp: could not get status for 'hdfs://\w+[.a-z]*:[0-9]+/file1': File does not exist: hdfs://\w+[.a-z]*:[0-9]+/file1</expected-output>
+          <expected-output>^chgrp: `hdfs://\w+[.a-z]*:[0-9]+/file1': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -16014,7 +16014,7 @@
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>moveFromLocal: File /user/wrongdata does not exist</expected-output>
+          <expected-output>moveFromLocal: `/user/wrongdata': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -16030,7 +16030,7 @@
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>moveFromLocal: File wrongdata does not exist</expected-output>
+          <expected-output>moveFromLocal: `wrongdata': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -16067,7 +16067,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^moveFromLocal: `wrongdir': specified destination directory doest not exist</expected-output>
+          <expected-output>^moveFromLocal: `wrongdir': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -16083,7 +16083,7 @@
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>moveFromLocal: File /user/wrongdata does not exist</expected-output>
+          <expected-output>moveFromLocal: `/user/wrongdata': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -16116,7 +16116,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^moveFromLocal: `hdfs:/wrongdir': specified destination directory doest not exist</expected-output>
+          <expected-output>^moveFromLocal: `hdfs:/wrongdir': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -16132,7 +16132,7 @@
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>moveFromLocal: File /user/wrongdata does not exist</expected-output>
+          <expected-output>moveFromLocal: `/user/wrongdata': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -16165,7 +16165,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^moveFromLocal: `hdfs://\w+[.a-z]*:[0-9]+/wrongdir': specified destination directory doest not exist</expected-output>
+          <expected-output>^moveFromLocal: `hdfs://\w+[.a-z]*:[0-9]+/wrongdir': No such file or directory</expected-output>
         </comparator>
       </comparators>
     </test>

Modified: hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestDFSShell.java
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestDFSShell.java?rev=1102005&r1=1102004&r2=1102005&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestDFSShell.java (original)
+++ hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/hdfs/TestDFSShell.java Wed May 11 18:07:07 2011
@@ -321,7 +321,7 @@ public class TestDFSShell extends TestCa
       argv[0] = "-cat";
       argv[1] = root.toUri().getPath();
       int ret = ToolRunner.run(new FsShell(), argv);
-      assertTrue(" -cat returned -1 ", 0>=ret);
+      assertEquals(" -cat returned 1 ", 1, ret);
       String returned = out.toString();
       assertTrue("cat does not print exceptions ",
           (returned.lastIndexOf("Exception") == -1));
@@ -389,7 +389,7 @@ public class TestDFSShell extends TestCa
       argv[1] = "/testdir";
       ret = ToolRunner.run(shell, argv);
       returned = out.toString();
-      assertTrue(" -mkdir returned -1 ", (ret < 0));
+      assertEquals(" -mkdir returned 1 ", 1, ret);
       assertTrue(" -mkdir returned File exists", 
           (returned.lastIndexOf("File exists") != -1));
       Path testFile = new Path("/testfile");
@@ -401,7 +401,7 @@ public class TestDFSShell extends TestCa
       argv[1] = "/testfile";
       ret = ToolRunner.run(shell, argv);
       returned = out.toString();
-      assertTrue(" -mkdir returned -1", (ret < 0));
+      assertEquals(" -mkdir returned 1", 1, ret);
       assertTrue(" -mkdir returned this is a file ",
           (returned.lastIndexOf("not a directory") != -1));
       out.reset();



Mime
View raw message