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

[suresh]

Author: suresh
Date: Mon Jan  7 01:34:20 2013
New Revision: 1429638

URL: http://svn.apache.org/viewvc?rev=1429638&view=rev
Log:
MAPREDUCE-4914. TestMiniMRDFSSort fails with openJDK7. Contributed by Brandon 
Li.

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

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1429638&r1=1429637&r2=1429638&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Mon Jan  7 01:34:20 2013
@@ -398,6 +398,9 @@ Release 1.2.0 - unreleased
     MAPREDUCE-4916. Fix flaxy test TestTrackerDistributedCacheManager. (Xuan
     Gong via acmurthy) 
 
+    MAPREDUCE-4914. TestMiniMRDFSSort fails with openJDK7. (Brandon Li via
+    suresh)
+
 Release 1.1.2 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: 
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestMiniMRDFSSort.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestMiniMRDFSSort.java?rev=1429638&r1=1429637&r2=1429638&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestMiniMRDFSSort.java
 (original)
+++ 
hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapred/TestMiniMRDFSSort.java
 Mon Jan  7 01:34:20 2013
@@ -167,13 +167,10 @@ public class TestMiniMRDFSSort extends T
     // Run sort-validator to check if sort worked correctly
     runSortValidator(mrCluster.createJobConf(), SORT_INPUT_PATH, 
                      SORT_OUTPUT_PATH);
-  }
-  
-  public void testJvmReuse() throws Exception {
+    // test JVM reuse
     runJvmReuseTest(mrCluster.createJobConf(), true);
-  }
-
-  public void testNoJvmReuse() throws Exception {
+    
+    // test no JVM reuse
     runJvmReuseTest(mrCluster.createJobConf(), false);
   }
 }