Author: szetszwo
Date: Thu Mar 8 21:39:36 2012
New Revision: 1298595
URL: http://svn.apache.org/viewvc?rev=1298595&view=rev
Log:
HDFS-2038: Supplemental changes for 0.23.2. Contributed by Kihwal Lee
Modified:
hadoop/common/branches/branch-0.23.2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml
Modified:
hadoop/common/branches/branch-0.23.2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23.2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml?rev=1298595&r1=1298594&r2=1298595&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23.2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml
(original)
+++
hadoop/common/branches/branch-0.23.2/hadoop-hdfs-project/hadoop-hdfs/src/test/resources/testHDFSConf.xml
Thu Mar 8 21:39:36 2012
@@ -15339,7 +15339,7 @@
<comparators>
<comparator>
<type>SubstringComparator</type>
- <expected-output>setSpaceQuota: java.io.FileNotFoundException:
Directory does not exist: /test1</expected-output>
+ <expected-output>setSpaceQuota: Directory does not exist:
/test1</expected-output>
</comparator>
</comparators>
</test>
@@ -15405,7 +15405,7 @@
<comparators>
<comparator>
<type>SubstringComparator</type>
- <expected-output>clrQuota: java.io.FileNotFoundException: Directory
does not exist: /test1</expected-output>
+ <expected-output>clrQuota: Directory does not exist:
/test1</expected-output>
</comparator>
</comparators>
</test>
@@ -15425,7 +15425,7 @@
<comparators>
<comparator>
<type>RegexpComparator</type>
- <expected-output>put:
org.apache.hadoop.hdfs.protocol.DSQuotaExceededException: The DiskSpace quota
of /dir1 is exceeded: quota=1.0k diskspace
consumed=[0-9.]+[kmg]*</expected-output>
+ <expected-output>put: The DiskSpace quota of /dir1 is exceeded:
quota=1.0k diskspace consumed=[0-9.]+[kmg]*</expected-output>
</comparator>
</comparators>
</test>
@@ -15445,7 +15445,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>
@@ -15711,7 +15711,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>
@@ -16087,7 +16087,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>
@@ -16106,7 +16106,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>
@@ -16126,7 +16126,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>
@@ -16145,7 +16145,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>
