Repository: oozie Updated Branches: refs/heads/master 058baab44 -> 4a666110f
OOZIE-2794 Hive and Pig tests failing when multiple pre-commit jobs are running (gezapeti) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/4a666110 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/4a666110 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/4a666110 Branch: refs/heads/master Commit: 4a666110f4dcef76b2412d82b9789d74fd45256d Parents: 058baab Author: Gezapeti Cseh <gezap...@gmail.com> Authored: Tue Jun 27 14:47:17 2017 +0200 Committer: Gezapeti Cseh <gezap...@gmail.com> Committed: Tue Jun 27 14:47:17 2017 +0200 ---------------------------------------------------------------------- core/src/test/java/org/apache/oozie/test/XTestCase.java | 4 +++- release-log.txt | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/4a666110/core/src/test/java/org/apache/oozie/test/XTestCase.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/test/XTestCase.java b/core/src/test/java/org/apache/oozie/test/XTestCase.java index caa6132..161927a 100644 --- a/core/src/test/java/org/apache/oozie/test/XTestCase.java +++ b/core/src/test/java/org/apache/oozie/test/XTestCase.java @@ -35,6 +35,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Properties; +import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; @@ -558,7 +559,7 @@ public abstract class XTestCase extends TestCase { /** * Return the test working directory. * <p/> - * It returns <code>${oozie.test.dir}/oozietests/TESTCLASSNAME/TESTMETHODNAME</code>. + * It returns <code>${oozie.test.dir}/oozietests/TESTCLASSNAME/TESTMETHODNAME/UNIQUE_ID</code>. * * @param testCase testcase instance to obtain the working directory. * @return the test working directory. @@ -569,6 +570,7 @@ public abstract class XTestCase extends TestCase { dir = new File(dir, "oozietests").getAbsoluteFile(); dir = new File(dir, testCase.getClass().getName()); dir = new File(dir, testCase.getName()); + dir = new File(dir, UUID.randomUUID().toString()); return dir.getAbsolutePath(); } http://git-wip-us.apache.org/repos/asf/oozie/blob/4a666110/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 014074c..6bded55 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.0.0 release (trunk - unreleased) +OOZIE-2794 Hive and Pig tests failing when multiple pre-commit jobs are running (gezapeti) OOZIE-2849 Fix build warnings when assembling directories (asasvari via gezapeti) OOZIE-2848 Override sharelib.tgz in distro when rebuilding Oozie (asasvari via gezapeti) OOZIE-2943 Fix Findbugs warnings in oozie-sharelib-pig (Jan Hentschel via gezapeti)
