svn commit: r1429641 - in /hadoop/common/branches/branch-1: CHANGES.txt src/test/org/apache/hadoop/mapred/TestShuffleExceptionCount.java

[suresh]

Author: suresh
Date: Mon Jan  7 01:40:14 2013
New Revision: 1429641

URL: http://svn.apache.org/viewvc?rev=1429641&view=rev
Log:
MAPREDUCE-4915. TestShuffleExceptionCount fails with open JDK7. Contributed by 
Brandon Li.

Modified:
    hadoop/common/branches/branch-1/CHANGES.txt
    
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestShuffleExceptionCount.java

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1429641&r1=1429640&r2=1429641&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Mon Jan  7 01:40:14 2013
@@ -401,6 +401,9 @@ Release 1.2.0 - unreleased
     MAPREDUCE-4914. TestMiniMRDFSSort fails with openJDK7. (Brandon Li via
     suresh)
 
+    MAPREDUCE-4915. TestShuffleExceptionCount fails with open JDK7.
+    (Brandon Li via suresh)
+
 Release 1.1.2 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestShuffleExceptionCount.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestShuffleExceptionCount.java?rev=1429641&r1=1429640&r2=1429641&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestShuffleExceptionCount.java
 (original)
+++ 
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestShuffleExceptionCount.java
 Mon Jan  7 01:40:14 2013
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertTru
 
 import java.io.IOException;
 
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class TestShuffleExceptionCount {
@@ -30,6 +31,11 @@ public class TestShuffleExceptionCount {
   static boolean abortCalled = false;
   private final float epsilon = 1e-5f;
 
+  @BeforeClass
+  public static void initialize() throws Exception {
+    abortCalled = false;
+  }
+    
   public static class TestShuffleExceptionTracker extends 
ShuffleExceptionTracker {
     private static final long serialVersionUID = 1L;