Repository: oozie Updated Branches: refs/heads/master 25a275c71 -> c9580d423
OOZIE-3125 amend TestDBLoadDump.testImportInvalidDataLeavesTablesEmpty fails (asasvari) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/c9580d42 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/c9580d42 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/c9580d42 Branch: refs/heads/master Commit: c9580d4234a142b1c7a1a618cece6aedb288031d Parents: 25a275c Author: Attila Sasvari <asasv...@cloudera.com> Authored: Mon Nov 20 12:42:06 2017 +0100 Committer: Attila Sasvari <asasv...@cloudera.com> Committed: Mon Nov 20 12:45:47 2017 +0100 ---------------------------------------------------------------------- core/src/test/resources/hsqldb-oozie-site.xml | 7 +--- .../test/resources/hsqldb-tools-oozie-site.xml | 34 ++++++++++++++++++++ release-log.txt | 1 + .../org/apache/oozie/tools/TestDBLoadDump.java | 2 ++ 4 files changed, 38 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/c9580d42/core/src/test/resources/hsqldb-oozie-site.xml ---------------------------------------------------------------------- diff --git a/core/src/test/resources/hsqldb-oozie-site.xml b/core/src/test/resources/hsqldb-oozie-site.xml index 833083e..fa5fe9c 100644 --- a/core/src/test/resources/hsqldb-oozie-site.xml +++ b/core/src/test/resources/hsqldb-oozie-site.xml @@ -22,13 +22,8 @@ <name>oozie.service.JPAService.jdbc.driver</name> <value>org.hsqldb.jdbcDriver</value> </property> - <!-- - It is required to enforce length checks for string fields while trying to persist objects with OpenJPA in tests. To this end, - we need to set sql.enforce_strict_size to true when creating the EntityManagerFactory object in JPAService. - Please see http://hsqldb.org/doc/guide/ch04.html HSQLDB docs for details. - --> <property> <name>oozie.service.JPAService.jdbc.url</name> - <value>jdbc:hsqldb:mem:oozie-db;create=true;sql.enforce_strict_size=true</value> + <value>jdbc:hsqldb:mem:oozie-db;create=true</value> </property> </configuration> http://git-wip-us.apache.org/repos/asf/oozie/blob/c9580d42/core/src/test/resources/hsqldb-tools-oozie-site.xml ---------------------------------------------------------------------- diff --git a/core/src/test/resources/hsqldb-tools-oozie-site.xml b/core/src/test/resources/hsqldb-tools-oozie-site.xml new file mode 100644 index 0000000..833083e --- /dev/null +++ b/core/src/test/resources/hsqldb-tools-oozie-site.xml @@ -0,0 +1,34 @@ +<?xml version="1.0"?> +<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<configuration> + <property> + <name>oozie.service.JPAService.jdbc.driver</name> + <value>org.hsqldb.jdbcDriver</value> + </property> + <!-- + It is required to enforce length checks for string fields while trying to persist objects with OpenJPA in tests. To this end, + we need to set sql.enforce_strict_size to true when creating the EntityManagerFactory object in JPAService. + Please see http://hsqldb.org/doc/guide/ch04.html HSQLDB docs for details. + --> + <property> + <name>oozie.service.JPAService.jdbc.url</name> + <value>jdbc:hsqldb:mem:oozie-db;create=true;sql.enforce_strict_size=true</value> + </property> +</configuration> http://git-wip-us.apache.org/repos/asf/oozie/blob/c9580d42/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index c0eab68..a7940bc 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.0.0 release (trunk - unreleased) +OOZIE-3125 amend TestDBLoadDump.testImportInvalidDataLeavesTablesEmpty fails (asasvari) OOZIE-3106 amend upgrade surefire-plugin to 2.20.1 (dbist13 via asasvari) OOZIE-2869 Ability to add/remove MapReduce jars from action classpath (gezapeti) OOZIE-2296 Add an Oozie diagnostic bundle tool (asasvari) http://git-wip-us.apache.org/repos/asf/oozie/blob/c9580d42/tools/src/test/java/org/apache/oozie/tools/TestDBLoadDump.java ---------------------------------------------------------------------- diff --git a/tools/src/test/java/org/apache/oozie/tools/TestDBLoadDump.java b/tools/src/test/java/org/apache/oozie/tools/TestDBLoadDump.java index 4f9d4bc..8badf27 100644 --- a/tools/src/test/java/org/apache/oozie/tools/TestDBLoadDump.java +++ b/tools/src/test/java/org/apache/oozie/tools/TestDBLoadDump.java @@ -57,6 +57,8 @@ public class TestDBLoadDump extends XTestCase { @Before protected void setUp() throws Exception { + // Use hsqldb-tools-oozie-site.xml with sql.enforce_strict_size=true in these tests + System.setProperty("oozie.test.db", "hsqldb-tools"); System.getProperties().remove("oozie.test.config.file"); super.setUp();
