Repository: oozie Updated Branches: refs/heads/master 830f0b541 -> f9f6a87f8
OOZIE-2967 TestStatusTransitService.testBundleStatusCoordSubmitFails fails intermittently in Apache Oozie Core 5.0.0-SNAPSHOT (pbacsko) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/f9f6a87f Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/f9f6a87f Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/f9f6a87f Branch: refs/heads/master Commit: f9f6a87f864da4021cb5702d4133cab193eb7c16 Parents: 830f0b5 Author: Peter Bacsko <pbac...@cloudera.com> Authored: Thu May 24 17:27:31 2018 +0200 Committer: Peter Bacsko <pbac...@cloudera.com> Committed: Thu May 24 17:27:31 2018 +0200 ---------------------------------------------------------------------- .../java/org/apache/oozie/service/TestStatusTransitService.java | 5 +---- release-log.txt | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/f9f6a87f/core/src/test/java/org/apache/oozie/service/TestStatusTransitService.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/service/TestStatusTransitService.java b/core/src/test/java/org/apache/oozie/service/TestStatusTransitService.java index 9315bad..019724e 100644 --- a/core/src/test/java/org/apache/oozie/service/TestStatusTransitService.java +++ b/core/src/test/java/org/apache/oozie/service/TestStatusTransitService.java @@ -1633,8 +1633,6 @@ public class TestStatusTransitService extends XDataTestCase { public void testBundleStatusCoordSubmitFails() throws Exception { setSystemProperty(StatusTransitService.CONF_BACKWARD_SUPPORT_FOR_STATES_WITHOUT_ERROR, "false"); - services = new Services(); - services.init(); BundleJobBean bundleJob = this.addRecordToBundleJobTable(Job.Status.RUNNING, false); final String bundleId = bundleJob.getId(); @@ -1644,14 +1642,13 @@ public class TestStatusTransitService extends XDataTestCase { // First try will kill the job. bundleJob = BundleJobQueryExecutor.getInstance().get(BundleJobQuery.GET_BUNDLE_JOB_STATUS, bundleId); assertEquals(Job.Status.FAILED, bundleJob.getStatus()); - sleep(1000); + bundleJob.setStatus(Job.Status.RUNNING); BundleJobQueryExecutor.getInstance().executeUpdate(BundleJobQuery.UPDATE_BUNDLE_JOB_STATUS_PENDING, bundleJob); runnable.run(); // second try will change the status. bundleJob = BundleJobQueryExecutor.getInstance().get(BundleJobQuery.GET_BUNDLE_JOB_STATUS, bundleId); assertEquals(Job.Status.FAILED, bundleJob.getStatus()); - } public void testBundleRunningAfterCoordResume() throws Exception { http://git-wip-us.apache.org/repos/asf/oozie/blob/f9f6a87f/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 96c3ce7..ce3f3cc 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.1.0 release (trunk - unreleased) +OOZIE-2967 TestStatusTransitService.testBundleStatusCoordSubmitFails fails intermittently in Apache Oozie Core 5.0.0-SNAPSHOT (pbacsko) OOZIE-3238 Flaky test TestStatusTransitService#testBundleStatusTransitWithLock (pbacsko via gezapeti, andras.piros) OOZIE-3185 Upgrade org.apache.derby to 10.11.1.1 (PandaMonkey via andras.piros) OOZIE-2883 ProxyUserService: invalid configuration error message is misleading (yangfang via andras.piros)