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

[suresh]

Author: suresh
Date: Mon Jan  7 01:41:49 2013
New Revision: 1429642

URL: http://svn.apache.org/viewvc?rev=1429642&view=rev
Log:
MAPREDUCE-4914. Merging change 1429638 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/TestMiniMRDFSSort.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=1429642&r1=1429641&r2=1429642&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:41:49 2013
@@ -325,3 +325,6 @@ Branch-hadoop-1-win (branched from branc
     HDFS-4358. TestCheckpoint failure with JDK7. (Arpit Agarwal via suresh)
 
     HADOOP-9179. TestFileSystem fails with open JDK7. (Brandon Li via suresh)
+
+    MAPREDUCE-4914. TestMiniMRDFSSort fails with openJDK7. (Brandon Li via
+    suresh)

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