You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by je...@apache.org on 2014/11/17 20:22:58 UTC

[49/50] [abbrv] tez git commit: TEZ-1690. TestMultiMRInput tests fail because of user collisions. (Vasanth kumar RJ via hitesh)

TEZ-1690. TestMultiMRInput tests fail because of user collisions. (Vasanth kumar RJ via hitesh)


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/571cea4f
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/571cea4f
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/571cea4f

Branch: refs/heads/TEZ-8
Commit: 571cea4f05caf7cb9677ada0f76f924b288580ce
Parents: dd03a81
Author: Hitesh Shah <hi...@apache.org>
Authored: Fri Nov 14 17:20:39 2014 -0800
Committer: Hitesh Shah <hi...@apache.org>
Committed: Fri Nov 14 17:20:39 2014 -0800

----------------------------------------------------------------------
 CHANGES.txt                                               |  1 +
 .../org/apache/tez/mapreduce/input/TestMultiMRInput.java  | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/571cea4f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index aa74705..bb31375 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,6 +12,7 @@ ALL CHANGES:
   TEZ-1736. Add support for Inputs/Outputs in runtime-library to generate history text data.
   TEZ-1721. Update INSTALL instructions for clarifying tez client jars
     compatibility with runtime tarball on HDFS.
+  TEZ-1690. TestMultiMRInput tests fail because of user collisions.
 
 Release 0.5.3: Unreleased
 

http://git-wip-us.apache.org/repos/asf/tez/blob/571cea4f/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/input/TestMultiMRInput.java
----------------------------------------------------------------------
diff --git a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/input/TestMultiMRInput.java b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/input/TestMultiMRInput.java
index 05f6bbc..47ec2b7 100644
--- a/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/input/TestMultiMRInput.java
+++ b/tez-mapreduce/src/test/java/org/apache/tez/mapreduce/input/TestMultiMRInput.java
@@ -53,6 +53,7 @@ import org.apache.tez.runtime.api.Event;
 import org.apache.tez.runtime.api.InputContext;
 import org.apache.tez.runtime.api.events.InputDataInformationEvent;
 import org.apache.tez.runtime.library.api.KeyValueReader;
+import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -69,8 +70,8 @@ public class TestMultiMRInput {
     defaultConf.set("fs.defaultFS", "file:///");
     try {
       localFs = FileSystem.getLocal(defaultConf);
-      testTmpDir = System.getProperty("test.build.data", "/tmp");
-      TEST_ROOT_DIR = new Path(testTmpDir, TestMultiMRInput.class.getSimpleName());
+      testTmpDir = System.getProperty("test.build.data", "target");
+      TEST_ROOT_DIR = new Path(testTmpDir, TestMultiMRInput.class.getSimpleName() + "-tmpDir");
     } catch (IOException e) {
       throw new RuntimeException(e);
     }
@@ -265,6 +266,11 @@ public class TestMultiMRInput {
     return inputContext;
   }
 
+  @AfterClass
+  public static void cleanUp() throws IOException {
+    localFs.delete(TEST_ROOT_DIR, true);
+  }
+
   public static LinkedHashMap<LongWritable, Text> createInputData(FileSystem fs, Path workDir,
                                                                   JobConf job, String filename,
                                                                   long startKey,