Repository: oozie Updated Branches: refs/heads/master a96e2d1c8 -> 5d26eade7
OOZIE-2486 TestSLAEventsGetForFilterJPAExecutor 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/5d26eade Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/5d26eade Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/5d26eade Branch: refs/heads/master Commit: 5d26eade7e2c07774160154cb14b5c208542b276 Parents: a96e2d1 Author: Robert Kanter <[email protected]> Authored: Thu Mar 31 15:53:48 2016 -0700 Committer: Robert Kanter <[email protected]> Committed: Thu Mar 31 15:53:48 2016 -0700 ---------------------------------------------------------------------- .../jpa/TestSLAEventsGetForFilterJPAExecutor.java | 10 +++++++--- release-log.txt | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/5d26eade/core/src/test/java/org/apache/oozie/executor/jpa/TestSLAEventsGetForFilterJPAExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/executor/jpa/TestSLAEventsGetForFilterJPAExecutor.java b/core/src/test/java/org/apache/oozie/executor/jpa/TestSLAEventsGetForFilterJPAExecutor.java index 42820bb..7613454 100644 --- a/core/src/test/java/org/apache/oozie/executor/jpa/TestSLAEventsGetForFilterJPAExecutor.java +++ b/core/src/test/java/org/apache/oozie/executor/jpa/TestSLAEventsGetForFilterJPAExecutor.java @@ -87,6 +87,7 @@ public class TestSLAEventsGetForFilterJPAExecutor extends XDataTestCase { JPAService jpaService = Services.get().get(JPAService.class); assertNotNull(jpaService); + // Use -1 instead of 0 because HSQLDB starts the event_id generator at 0 instead of 1 SLAEventsGetForFilterJPAExecutor slaEventsGetCmd = new SLAEventsGetForFilterJPAExecutor(-1, 100, filterListJob1, new long[1]); List<SLAEventBean> list = jpaService.execute(slaEventsGetCmd); @@ -98,7 +99,8 @@ public class TestSLAEventsGetForFilterJPAExecutor extends XDataTestCase { Map<String, List<String>> filterListAction1 = createFilterList("jobid", coordActionId1); JPAService jpaService = Services.get().get(JPAService.class); assertNotNull(jpaService); - SLAEventsGetForFilterJPAExecutor slaEventsGetCmd = new SLAEventsGetForFilterJPAExecutor(0, 100, + // Use -1 instead of 0 because HSQLDB starts the event_id generator at 0 instead of 1 + SLAEventsGetForFilterJPAExecutor slaEventsGetCmd = new SLAEventsGetForFilterJPAExecutor(-1, 100, filterListAction1, new long[1]); List<SLAEventBean> list = jpaService.execute(slaEventsGetCmd); assertNotNull(list); @@ -120,7 +122,8 @@ public class TestSLAEventsGetForFilterJPAExecutor extends XDataTestCase { Map<String, List<String>> filterList = createFilterList("jobid", coordId1, coordActionId1); JPAService jpaService = Services.get().get(JPAService.class); assertNotNull(jpaService); - SLAEventsGetForFilterJPAExecutor slaEventsGetCmd = new SLAEventsGetForFilterJPAExecutor(0, 100, filterList, + // Use -1 instead of 0 because HSQLDB starts the event_id generator at 0 instead of 1 + SLAEventsGetForFilterJPAExecutor slaEventsGetCmd = new SLAEventsGetForFilterJPAExecutor(-1, 100, filterList, new long[1]); List<SLAEventBean> list = jpaService.execute(slaEventsGetCmd); assertNotNull(list); @@ -134,7 +137,8 @@ public class TestSLAEventsGetForFilterJPAExecutor extends XDataTestCase { assertNotNull(jpaService); long[] lastSeqId = new long[1]; lastSeqId[0] = -1; - SLAEventsGetForFilterJPAExecutor slaEventsGetCmd = new SLAEventsGetForFilterJPAExecutor(0, 100, filterList, + // Use -1 instead of 0 because HSQLDB starts the event_id generator at 0 instead of 1 + SLAEventsGetForFilterJPAExecutor slaEventsGetCmd = new SLAEventsGetForFilterJPAExecutor(-1, 100, filterList, lastSeqId); List<SLAEventBean> list = jpaService.execute(slaEventsGetCmd); assertNotNull(list); http://git-wip-us.apache.org/repos/asf/oozie/blob/5d26eade/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 3de30b3..b8f7b03 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.3.0 release (trunk - unreleased) +OOZIE-2486 TestSLAEventsGetForFilterJPAExecutor is flakey (rkanter) OOZIE-2481 Add YARN_CONF_DIR in the Shell action (harsh) OOZIE-2492 JSON security issue in js code (fdenes via rkanter) OOZIE-2429 TestEventGeneration test is flakey (fdenes via rkanter)
