fixed non-idempotent tests

apache · May 1, 2024 · c26f50f · c26f50f
1 parent 0c9e0b4
commit c26f50f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/...duce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestOldCombinerGrouping.java b/...duce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestOldCombinerGrouping.java
@@ -19,6 +19,7 @@
 package org.apache.hadoop.mapred;
 
 import org.junit.Assert;
+import org.apache.hadoop.fs.FileUtil;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.LongWritable;
 import org.apache.hadoop.io.RawComparator;
@@ -119,7 +120,11 @@ public int compare(Text o1, Text o2) {
 
   @Test
   public void testCombiner() throws Exception {
-    if (!new File(TEST_ROOT_DIR).mkdirs()) {
+    File testDir = new File(TEST_ROOT_DIR);
+    if (testDir.exists()) {
+      FileUtil.fullyDelete(testDir);
+    }
+    if (!testDir.mkdirs()) {
       throw new RuntimeException("Could not create test dir: " + TEST_ROOT_DIR);
     }
     File in = new File(TEST_ROOT_DIR, "input");

diff --git a/...e-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestNewCombinerGrouping.java b/...e-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestNewCombinerGrouping.java
@@ -19,6 +19,7 @@
 package org.apache.hadoop.mapreduce;
 
 import org.junit.Assert;
+import org.apache.hadoop.fs.FileUtil;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.LongWritable;
 import org.apache.hadoop.io.RawComparator;
@@ -105,7 +106,11 @@ public int compare(Text o1, Text o2) {
 
   @Test
   public void testCombiner() throws Exception {
-    if (!new File(TEST_ROOT_DIR).mkdirs()) {
+    File testDir = new File(TEST_ROOT_DIR);
+    if (testDir.exists()) {
+      FileUtil.fullyDelete(testDir);
+    }
+    if (!testDir.mkdirs()) {
       throw new RuntimeException("Could not create test dir: " + TEST_ROOT_DIR);
     }
     File in = new File(TEST_ROOT_DIR, "input");