Repository: oozie Updated Branches: refs/heads/master 87f15e04d -> be88d8c44
OOZIE-2386 org.apache.oozie.util.TestXConfiguration.testSubstituteVar is flakey (rkanter) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/be88d8c4 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/be88d8c4 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/be88d8c4 Branch: refs/heads/master Commit: be88d8c44a30b0c01d27536a54a71d2d979a594a Parents: 87f15e0 Author: Robert Kanter <[email protected]> Authored: Fri Oct 9 14:34:38 2015 -0700 Committer: Robert Kanter <[email protected]> Committed: Fri Oct 9 14:34:38 2015 -0700 ---------------------------------------------------------------------- .../test/java/org/apache/oozie/util/TestXConfiguration.java | 9 ++++++++- release-log.txt | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/be88d8c4/core/src/test/java/org/apache/oozie/util/TestXConfiguration.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/util/TestXConfiguration.java b/core/src/test/java/org/apache/oozie/util/TestXConfiguration.java index 5728c3f..a7faf97 100644 --- a/core/src/test/java/org/apache/oozie/util/TestXConfiguration.java +++ b/core/src/test/java/org/apache/oozie/util/TestXConfiguration.java @@ -38,6 +38,14 @@ import org.apache.oozie.test.XTestCase; public class TestXConfiguration extends XTestCase { + @Override + public void setUp() throws Exception { + // Make sure to reinitialize XConfiguration for each of these tests in case they rely on it doing something (e.g. setting + // max substitution depth) + XConfiguration.initalized = false; + super.setUp(); + } + public void testFromStream() throws Exception { String configPath = "test-oozie-default.xml"; InputStream is = IOUtils.getResourceAsStream(configPath, -1); @@ -229,7 +237,6 @@ public class TestXConfiguration extends XTestCase { } public void testSubstituteVarUnlimited() throws ServiceException { - XConfiguration.initalized = false; Services services = new Services(); services.get(ConfigurationService.class).getConf().set(XConfiguration.CONFIGURATION_SUBSTITUTE_DEPTH, "-1"); services.init(); http://git-wip-us.apache.org/repos/asf/oozie/blob/be88d8c4/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 257d08b..c8ac6ab 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.3.0 release (trunk - unreleased) +OOZIE-2386 org.apache.oozie.util.TestXConfiguration.testSubstituteVar is flakey (rkanter) OOZIE-2385 org.apache.oozie.TestCoordinatorEngineStreamLog.testCoordLogStreaming is flakey (rkanter) OOZIE-2382 org.apache.oozie.action.hadoop.TestPigMain.testPig_withNullExternalID is flakey (rkanter) OOZIE-2379 org.apache.oozie.command.coord.TestCoordPushDependencyCheckXCommand.testRequeueOnException is flakey (rkanter)
