Repository: oozie Updated Branches: refs/heads/master cdaa66bd7 -> 9c365b569
OOZIE-2432 TestPurgeXCommand fails (fdenes via rkanter) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/9c365b56 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/9c365b56 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/9c365b56 Branch: refs/heads/master Commit: 9c365b5691439eb0e982b3a915c1a842270b24c4 Parents: cdaa66b Author: Robert Kanter <[email protected]> Authored: Mon Jan 25 13:06:32 2016 -0800 Committer: Robert Kanter <[email protected]> Committed: Mon Jan 25 13:06:32 2016 -0800 ---------------------------------------------------------------------- .../java/org/apache/oozie/command/TestPurgeXCommand.java | 8 ++++++-- release-log.txt | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/9c365b56/core/src/test/java/org/apache/oozie/command/TestPurgeXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/command/TestPurgeXCommand.java b/core/src/test/java/org/apache/oozie/command/TestPurgeXCommand.java index d141538..20a59c0 100644 --- a/core/src/test/java/org/apache/oozie/command/TestPurgeXCommand.java +++ b/core/src/test/java/org/apache/oozie/command/TestPurgeXCommand.java @@ -241,6 +241,7 @@ public class TestPurgeXCommand extends XDataTestCase { jpaService.execute(wfJobGetCmd); } catch (JPAExecutorException ce) { + ce.printStackTrace(); fail("Workflow Job should not have been purged"); } @@ -2296,6 +2297,7 @@ public class TestPurgeXCommand extends XDataTestCase { jpaService.execute(wfJobGetCmd); } catch (JPAExecutorException je) { + je.printStackTrace(); fail("Workflow Job should not have been purged"); } @@ -3853,8 +3855,10 @@ public class TestPurgeXCommand extends XDataTestCase { conf.set(OozieClient.USER_NAME, getTestUser()); WorkflowJobBean wfBean = createWorkflow(app, conf, jobStatus, instanceStatus); - wfBean.setStartTime(DateUtils.parseDateOozieTZ("2015-12-18T01:00Z")); - wfBean.setEndTime(DateUtils.parseDateOozieTZ("2015-12-18T03:00Z")); + //Set start time to 100 days from now + wfBean.setStartTime(new Date(System.currentTimeMillis() + (long)100*24*60*60*1000)); + //Set end time to 100 days + 2 hours from now + wfBean.setEndTime(new Date(System.currentTimeMillis() + (long)100*24*60*60*1000 + (long)2*60*60*1000)); try { JPAService jpaService = Services.get().get(JPAService.class); http://git-wip-us.apache.org/repos/asf/oozie/blob/9c365b56/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index d35b2c2..1b675bb 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.3.0 release (trunk - unreleased) +OOZIE-2432 TestPurgeXCommand fails (fdenes via rkanter) OOZIE-2434 inconsistent coord action status and workflow job status (satishsaley via puru) OOZIE-2438 Oozie client "jobs -filter" diagnostic message clarification (satishsaley via puru) OOZIE-2165 Job log fetching can fail in Oozie HA mode when using doAs impersonation (satishsaley via puru)
