Repository: oozie Updated Branches: refs/heads/master 481863892 -> 26db6712b
OOZIE-3226 [tools] TestOozieDBCLI#testOozieDBCLI() fails (pbacsko via gezapeti) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/26db6712 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/26db6712 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/26db6712 Branch: refs/heads/master Commit: 26db6712bbe2c87b610c1becc57d39fff56539d8 Parents: 4818638 Author: Gezapeti Cseh <gezap...@apache.org> Authored: Wed May 16 22:17:18 2018 +0200 Committer: Gezapeti Cseh <gezap...@apache.org> Committed: Wed May 16 22:17:18 2018 +0200 ---------------------------------------------------------------------- release-log.txt | 1 + .../org/apache/oozie/tools/TestOozieDBCLI.java | 29 +++++++++++--------- 2 files changed, 17 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/26db6712/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 0cc6b39..3760dbf 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.1.0 release (trunk - unreleased) +OOZIE-3226 [tools] TestOozieDBCLI#testOozieDBCLI() fails (pbacsko via gezapeti) OOZIE-2968 TestJavaActionExecutor.testCredentialsSkip fails intermittently (pbacsko via gezapeti) OOZIE-3228 [Spark action] Can't load properties from spark-defaults.conf (andras.piros) OOZIE-3250 Reduce heap waste by reducing duplicate byte[] count (andras.piros) http://git-wip-us.apache.org/repos/asf/oozie/blob/26db6712/tools/src/test/java/org/apache/oozie/tools/TestOozieDBCLI.java ---------------------------------------------------------------------- diff --git a/tools/src/test/java/org/apache/oozie/tools/TestOozieDBCLI.java b/tools/src/test/java/org/apache/oozie/tools/TestOozieDBCLI.java index 4cebb7a..c0568ca 100644 --- a/tools/src/test/java/org/apache/oozie/tools/TestOozieDBCLI.java +++ b/tools/src/test/java/org/apache/oozie/tools/TestOozieDBCLI.java @@ -24,7 +24,6 @@ import org.apache.hadoop.fs.FileUtil; import org.apache.oozie.test.XTestCase; import org.junit.AfterClass; import org.junit.Assert; -import org.junit.BeforeClass; import java.io.ByteArrayOutputStream; import java.io.File; @@ -50,26 +49,30 @@ public class TestOozieDBCLI extends XTestCase { private SecurityManager SECURITY_MANAGER; private static String url = "jdbc:derby:target/test-data/oozietests/org.apache.oozie.tools.TestOozieDBCLI/data.db;create=true"; private String oozieConfig; + private static boolean databaseCreated = false; - @BeforeClass + @Override protected void setUp() throws Exception { - SECURITY_MANAGER = System.getSecurityManager(); - new LauncherSecurityManager(); - // remove an old variant - FileUtil.fullyDelete(new File("target/test-data/oozietests/org.apache.oozie.tools.TestOozieDBCLI/data.db")); this.oozieConfig = System.getProperty("oozie.test.config.file"); File oozieConfig = new File("src/test/resources/hsqldb-oozie-site.xml"); - System.setProperty("oozie.test.config.file", oozieConfig.getAbsolutePath()); - Class.forName("org.apache.derby.jdbc.EmbeddedDriver"); - Connection conn = getConnection(); - conn.close(); + SECURITY_MANAGER = System.getSecurityManager(); + new LauncherSecurityManager(); - super.setUp(false); + if (!databaseCreated) { + // remove an old variant + FileUtil.fullyDelete(new File("target/test-data/oozietests/org.apache.oozie.tools.TestOozieDBCLI/data.db")); + Class.forName("org.apache.derby.jdbc.EmbeddedDriver"); + Connection conn = getConnection(); + conn.close(); + databaseCreated = true; + } + + super.setUp(false); } - @AfterClass + @Override protected void tearDown() throws Exception { System.setSecurityManager(SECURITY_MANAGER); if(oozieConfig!=null){ @@ -95,7 +98,7 @@ public class TestOozieDBCLI extends XTestCase { public void testServicesDestroy() throws Exception { Services services = new Services(); File runtimeDir = new File(services.getRuntimeDir()).getParentFile(); - String systemId = services.getSystemId(); + final String systemId = services.getSystemId(); File[] dirsBefore = runtimeDir.listFiles(new FilenameFilter() { public boolean accept(final File dir, final String name) {