svn commit: r1357016 - in /hadoop/common/branches/branch-1: CHANGES.txt src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLogLoading.java

[szetszwo]

Author: szetszwo
Date: Tue Jul  3 23:56:37 2012
New Revision: 1357016

URL: http://svn.apache.org/viewvc?rev=1357016&view=rev
Log:
HDFS-3595. Update the regular expression in TestEditLogLoading for the error 
message change by HDFS-3521.  Contributed by Colin Patrick McCabe

Modified:
    hadoop/common/branches/branch-1/CHANGES.txt
    
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLogLoading.java

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1357016&r1=1357015&r2=1357016&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Tue Jul  3 23:56:37 2012
@@ -46,6 +46,9 @@ Release 1.2.0 - unreleased
     MAPREDUCE-3837. Job tracker is not able to recover job in case of crash
     and after that no user can submit job. (Mayank Bansal via tomwhite)
 
+    HDFS-3595. Update the regular expression in TestEditLogLoading for the
+    error message change by HDFS-3521.  (Colin Patrick McCabe via szetszwo)
+
 Release 1.1.0 - unreleased
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLogLoading.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLogLoading.java?rev=1357016&r1=1357015&r2=1357016&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLogLoading.java
 (original)
+++ 
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLogLoading.java
 Tue Jul  3 23:56:37 2012
@@ -65,8 +65,8 @@ public class TestEditLogLoading {
     }
     rwf.close();
 
-    String expectedErrorMessage = "^Error replaying edit log at offset \\d+\n";
-    expectedErrorMessage += "Recent opcode offsets: (\\d+\\s*){4}$";
+    String expectedErrorMessage = "^Failed to parse edit log.*";
+    expectedErrorMessage += ", Recent opcode offsets=\\[(\\d+\\s*){4}\\]$";
     try {
       cluster = new MiniDFSCluster(0, conf, NUM_DATA_NODES, false, false, 
null, null);
       cluster.waitActive();