HDFS-3595. Update the regular expression in TestEditLogLoading for the error message change by HDFS-3521. Contributed by Colin Patrick McCabe

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-1@1357016 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -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

src/test/org/apache/hadoop/hdfs/server/namenode/TestEditLogLoading.java

@@ -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();