Author: suresh
Date: Fri Apr 23 08:05:54 2010
New Revision: 937185
URL: http://svn.apache.org/viewvc?rev=937185&view=rev
Log:
HDFS-1083. Update TestHDFSCLI not to expect exception class name in error
messages. Contributed by Suresh Srinivas.
Modified:
hadoop/hdfs/trunk/CHANGES.txt
hadoop/hdfs/trunk/src/test/hdfs/org/apache/hadoop/cli/testHDFSConf.xml
Modified: hadoop/hdfs/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=937185&r1=937184&r2=937185&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Fri Apr 23 08:05:54 2010
@@ -137,6 +137,9 @@ Trunk (unreleased changes)
HDFS-1087. Modify audit log to use a StringBuilder rather than a Formatter.
(cdouglas)
+ HDFS-1083. Update TestHDFSCLI not to expect exception class name
+ in error messages. (suresh)
+
OPTIMIZATIONS
HDFS-946. NameNode should not return full path name when lisitng a
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=937185&r1=937184&r2=937185&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 Fri
Apr 23 08:05:54 2010
@@ -5194,7 +5194,7 @@
<comparators>
<comparator>
<type>RegexpComparator</type>
- <expected-output>^cat: java.io.FileNotFoundException: File does not
exist: /file</expected-output>
+ <expected-output>^cat: File does not exist: /file</expected-output>
</comparator>
</comparators>
</test>
@@ -5209,7 +5209,7 @@
<comparators>
<comparator>
<type>RegexpComparator</type>
- <expected-output>^cat: java.io.FileNotFoundException: File does not
exist: /user/[a-z]*/file</expected-output>
+ <expected-output>^cat: File does not exist:
/user/[a-z]*/file</expected-output>
</comparator>
</comparators>
</test>
@@ -5226,7 +5226,7 @@
<comparators>
<comparator>
<type>RegexpComparator</type>
- <expected-output>^cat: java.io.FileNotFoundException: File does not
exist: /dir1</expected-output>
+ <expected-output>^cat: File does not exist: /dir1</expected-output>
</comparator>
</comparators>
</test>
@@ -5243,7 +5243,7 @@
<comparators>
<comparator>
<type>RegexpComparator</type>
- <expected-output>^cat: java.io.FileNotFoundException: File does not
exist: /user/[a-z]*/dir</expected-output>
+ <expected-output>^cat: File does not exist:
/user/[a-z]*/dir</expected-output>
</comparator>
</comparators>
</test>
@@ -5317,7 +5317,7 @@
<comparators>
<comparator>
<type>RegexpComparator</type>
- <expected-output>^cat: java.io.FileNotFoundException: File does not
exist: /file</expected-output>
+ <expected-output>^cat: File does not exist: /file</expected-output>
</comparator>
</comparators>
</test>
@@ -5334,7 +5334,7 @@
<comparators>
<comparator>
<type>RegexpComparator</type>
- <expected-output>^cat: java.io.FileNotFoundException: File does not
exist: /dir1</expected-output>
+ <expected-output>^cat: File does not exist: /dir1</expected-output>
</comparator>
</comparators>
</test>
@@ -5409,7 +5409,7 @@
<comparators>
<comparator>
<type>RegexpComparator</type>
- <expected-output>^cat: java.io.FileNotFoundException: File does not
exist: /file</expected-output>
+ <expected-output>^cat: File does not exist: /file</expected-output>
</comparator>
</comparators>
</test>
@@ -5426,7 +5426,7 @@
<comparators>
<comparator>
<type>RegexpComparator</type>
- <expected-output>^cat: java.io.FileNotFoundException: File does not
exist: /dir1</expected-output>
+ <expected-output>^cat: File does not exist: /dir1</expected-output>
</comparator>
</comparators>
</test>
@@ -16290,7 +16290,7 @@
<comparators>
<comparator>
<type>RegexpComparator</type>
- <expected-output>put:
org.apache.hadoop.hdfs.protocol.DSQuotaExceededException: The DiskSpace quota
of /dir1 is exceeded: quota=1024 diskspace
consumed=[0-9.]+[kmg]*</expected-output>
+ <expected-output>put: The DiskSpace quota of /dir1 is exceeded:
quota=1024 diskspace consumed=[0-9.]+[kmg]*</expected-output>
</comparator>
</comparators>
</test>
@@ -16310,7 +16310,7 @@
<comparators>
<comparator>
<type>SubstringComparator</type>
- <expected-output>mkdir:
org.apache.hadoop.hdfs.protocol.NSQuotaExceededException: The NameSpace quota
(directories and files) of directory /dir1 is exceeded: quota=1 file
count=2</expected-output>
+ <expected-output>mkdir: The NameSpace quota (directories and files)
of directory /dir1 is exceeded: quota=1 file count=2</expected-output>
</comparator>
</comparators>
</test>
@@ -16576,7 +16576,7 @@
<comparators>
<comparator>
<type>TokenComparator</type>
- <expected-output>saveNamespace: java.io.IOException: Safe mode
should be turned ON in order to create namespace image.</expected-output>
+ <expected-output>saveNamespace: Safe mode should be turned ON in
order to create namespace image.</expected-output>
</comparator>
</comparators>
</test>
@@ -16951,7 +16951,7 @@
<comparators>
<comparator>
<type>SubstringComparator</type>
- <expected-output>setQuota:
org.apache.hadoop.hdfs.server.namenode.SafeModeException: Cannot set quota on
/test. Name node is in safe mode.</expected-output>
+ <expected-output>setQuota: Cannot set quota on /test. Name node is
in safe mode.</expected-output>
</comparator>
</comparators>
</test>
@@ -16970,7 +16970,7 @@
<comparators>
<comparator>
<type>SubstringComparator</type>
- <expected-output>clrQuota:
org.apache.hadoop.hdfs.server.namenode.SafeModeException: Cannot set quota on
/test. Name node is in safe mode.</expected-output>
+ <expected-output>clrQuota: Cannot set quota on /test. Name node is
in safe mode.</expected-output>
</comparator>
</comparators>
</test>
@@ -16990,7 +16990,7 @@
<comparators>
<comparator>
<type>SubstringComparator</type>
- <expected-output>setSpaceQuota:
org.apache.hadoop.hdfs.server.namenode.SafeModeException: Cannot set quota on
/test. Name node is in safe mode.</expected-output>
+ <expected-output>setSpaceQuota: Cannot set quota on /test. Name node
is in safe mode.</expected-output>
</comparator>
</comparators>
</test>
@@ -17009,7 +17009,7 @@
<comparators>
<comparator>
<type>SubstringComparator</type>
- <expected-output>clrSpaceQuota:
org.apache.hadoop.hdfs.server.namenode.SafeModeException: Cannot set quota on
/test. Name node is in safe mode.</expected-output>
+ <expected-output>clrSpaceQuota: Cannot set quota on /test. Name node
is in safe mode.</expected-output>
</comparator>
</comparators>
</test>
