svn commit: r1428623 - in /hadoop/common/branches/branch-1-win: CHANGES.branch-1-win.txt src/test/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java src/test/org/apache/hadoop/mapreduce/lib/input/TestKeyValueTextInputFormat.java

[suresh]

Author: suresh
Date: Thu Jan  3 21:53:59 2013
New Revision: 1428623

URL: http://svn.apache.org/viewvc?rev=1428623&view=rev
Log:
MAPREDUCE-4909. Merge r1428620 from branch-1 to branch-1-win

Modified:
    hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt
    
hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java
    
hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/mapreduce/lib/input/TestKeyValueTextInputFormat.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=1428623&r1=1428622&r2=1428623&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 Thu Jan  3 
21:53:59 2013
@@ -313,5 +313,8 @@ Branch-hadoop-1-win (branched from branc
     HADOOP-9174. TestSecurityUtil fails with Open JDK 7. (Arpit Agarwal via
     suresh)
 
-    HADOOP-9175. TestWritableName fails with Open JDK 7. Contributed by Arpit
-    Agarwal.
+    HADOOP-9175. TestWritableName fails with Open JDK 7. (Arpit Agarwal via
+    suresh)
+
+    MAPREDUCE-4909. TestKeyValueTextInputFormat fails with Open JDK 7 on
+    Windows. (Arpit Agarwal via suresh)

Modified: 
hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java?rev=1428623&r1=1428622&r2=1428623&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java
 (original)
+++ 
hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java
 Thu Jan  3 21:53:59 2013
@@ -47,10 +47,14 @@ public class TestKeyValueTextInputFormat
   private static Path workDir = 
     new Path(new Path(System.getProperty("test.build.data", "."), "data"),
              "TestKeyValueTextInputFormat");
+
+  private static Path workDirFormat =
+      new Path(new Path(System.getProperty("test.build.data", "."), "data"),
+          "TestKeyValueTextInputFormat-testFormat");
   
   public void testFormat() throws Exception {
     JobConf job = new JobConf();
-    Path file = new Path(workDir, "test.txt");
+    Path file = new Path(workDirFormat, "test.txt");
 
     // A reporter that does nothing
     Reporter reporter = Reporter.NULL;
@@ -59,8 +63,8 @@ public class TestKeyValueTextInputFormat
     LOG.info("seed = "+seed);
     Random random = new Random(seed);
 
-    localFs.delete(workDir, true);
-    FileInputFormat.setInputPaths(job, workDir);
+    localFs.delete(workDirFormat, true);
+    FileInputFormat.setInputPaths(job, workDirFormat);
 
     // for a variety of lengths
     for (int length = 0; length < MAX_LENGTH;

Modified: 
hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/mapreduce/lib/input/TestKeyValueTextInputFormat.java
URL: 
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/mapreduce/lib/input/TestKeyValueTextInputFormat.java?rev=1428623&r1=1428622&r2=1428623&view=diff
==============================================================================
--- 
hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/mapreduce/lib/input/TestKeyValueTextInputFormat.java
 (original)
+++ 
hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/mapreduce/lib/input/TestKeyValueTextInputFormat.java
 Thu Jan  3 21:53:59 2013
@@ -55,17 +55,21 @@ public class TestKeyValueTextInputFormat
   private static Path workDir = 
     new Path(new Path(System.getProperty("test.build.data", "."), "data"),
              "TestKeyValueTextInputFormat");
+
+  private static Path workDirFormat =
+      new Path(new Path(System.getProperty("test.build.data", "."), "data"),
+          "TestKeyValueTextInputFormat-testFormat");
   
   public void testFormat() throws Exception {
     Job job = new Job(defaultConf);
-    Path file = new Path(workDir, "test.txt");
+    Path file = new Path(workDirFormat, "test.txt");
 
     int seed = new Random().nextInt();
     LOG.info("seed = "+seed);
     Random random = new Random(seed);
 
-    localFs.delete(workDir, true);
-    FileInputFormat.setInputPaths(job, workDir);
+    localFs.delete(workDirFormat, true);
+    FileInputFormat.setInputPaths(job, workDirFormat);
 
     // for a variety of lengths
     for (int length = 0; length < MAX_LENGTH;