Repository: oozie Updated Branches: refs/heads/master be88d8c44 -> 7a80c6528
OOZIE-2386 org.apache.oozie.util.TestXConfiguration.testSubstituteVar is flakey amendment (rkanter) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/7a80c652 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/7a80c652 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/7a80c652 Branch: refs/heads/master Commit: 7a80c6528aa9e5b5cdcbaa7364c2cc5c6ad5ecde Parents: be88d8c Author: Robert Kanter <[email protected]> Authored: Sat Oct 10 13:26:55 2015 -0700 Committer: Robert Kanter <[email protected]> Committed: Sat Oct 10 13:26:55 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/oozie/util/TestXConfiguration.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/7a80c652/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 a7faf97..a24fd43 100644 --- a/core/src/test/java/org/apache/oozie/util/TestXConfiguration.java +++ b/core/src/test/java/org/apache/oozie/util/TestXConfiguration.java @@ -38,14 +38,6 @@ 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); @@ -215,6 +207,7 @@ public class TestXConfiguration extends XTestCase { services.init(); int depth = ConfigurationService.getInt(XConfiguration.CONFIGURATION_SUBSTITUTE_DEPTH); + XConfiguration.initalized = false; XConfiguration conf = new XConfiguration(); conf.set("key0", "hello"); for (int i = 1; i < depth + 5; i++) { @@ -243,6 +236,7 @@ public class TestXConfiguration extends XTestCase { int depth = ConfigurationService.getInt(XConfiguration.CONFIGURATION_SUBSTITUTE_DEPTH); assertEquals(-1, depth); + XConfiguration.initalized = false; XConfiguration conf = new XConfiguration(); conf.set("key0", "hello"); int testMax = 100;
