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

[hitesh]

Author: hitesh
Date: Mon May 20 20:12:35 2013
New Revision: 1484577

URL: http://svn.apache.org/r1484577
Log:
MAPREDUCE-5095. TestShuffleExceptionCount#testCheckException fails occasionally 
with JDK7. (Contributed by Arpit Agarwal)

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=1484577&r1=1484576&r2=1484577&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Mon May 20 20:12:35 2013
@@ -49,6 +49,9 @@ Release 1.3.0 - unreleased
     MAPREDUCE-5217. Fix DistCP to work when launched by Oozie on a secure
     cluster. (Venkat Ranganathan via sseth)
 
+    MAPREDUCE-5095. TestShuffleExceptionCount#testCheckException fails
+    occasionally with JDK7 (Arpit Agarwal via hitesh)
+
 Release 1.2.1 - 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=1484577&r1=1484576&r2=1484577&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 May 20 20:12:35 2013
@@ -23,7 +23,7 @@ import static org.junit.Assert.assertTru
 
 import java.io.IOException;
 
-import org.junit.BeforeClass;
+import org.junit.Before;
 import org.junit.Test;
 
 public class TestShuffleExceptionCount {
@@ -31,8 +31,8 @@ public class TestShuffleExceptionCount {
   static boolean abortCalled = false;
   private final float epsilon = 1e-5f;
 
-  @BeforeClass
-  public static void initialize() throws Exception {
+  @Before
+  public void initialize() throws Exception {
     abortCalled = false;
   }
     
@@ -52,7 +52,6 @@ public class TestShuffleExceptionCount {
 
   @Test
   public void testCheckException() throws IOException, InterruptedException {
-
     // first test with only MsgRegex set but doesn't match
     String exceptionMsgRegex = "Broken pipe";
     String exceptionStackRegex = null;