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

[suresh]

Author: suresh
Date: Mon Jan  7 01:44:07 2013
New Revision: 1429644

URL: http://svn.apache.org/viewvc?rev=1429644&view=rev
Log:
MAPREDUCE-4915. Merge 1429641 from branch-1

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

Modified: hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt?rev=1429644&r1=1429643&r2=1429644&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt (original)
+++ hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt Mon Jan  7 
01:44:07 2013
@@ -328,3 +328,6 @@ Branch-hadoop-1-win (branched from branc
 
     MAPREDUCE-4914. TestMiniMRDFSSort fails with openJDK7. (Brandon Li via
     suresh)
+
+    MAPREDUCE-4915. TestShuffleExceptionCount fails with open JDK7.
+    (Brandon Li via suresh)

Modified: 
hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/mapred/TestShuffleExceptionCount.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/mapred/TestShuffleExceptionCount.java?rev=1429644&r1=1429643&r2=1429644&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/mapred/TestShuffleExceptionCount.java
 (original)
+++ 
hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/mapred/TestShuffleExceptionCount.java
 Mon Jan  7 01:44:07 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;