Repository: oozie Updated Branches: refs/heads/master 22e071036 -> 62e616155
OOZIE-2577 Flaky tests TestCoordActionInputCheckXCommand.testTimeout and testTimeoutWithException (pbacsko via rkanter) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/62e61615 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/62e61615 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/62e61615 Branch: refs/heads/master Commit: 62e6161551c65a6391f720e07b5ba0954edc1d8a Parents: 22e0710 Author: Robert Kanter <[email protected]> Authored: Thu Jun 16 16:14:17 2016 -0700 Committer: Robert Kanter <[email protected]> Committed: Thu Jun 16 16:14:17 2016 -0700 ---------------------------------------------------------------------- .../oozie/command/coord/TestCoordActionInputCheckXCommand.java | 4 ++-- release-log.txt | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/62e61615/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java b/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java index 16bf288..bbe9ea7 100644 --- a/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java +++ b/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionInputCheckXCommand.java @@ -750,7 +750,7 @@ public class TestCoordActionInputCheckXCommand extends XDataTestCase { long timeOutCreationTime = System.currentTimeMillis() - (12 * 60 * 1000); setCoordActionCreationTime(actionId, timeOutCreationTime); new CoordActionInputCheckXCommand(actionId, actionId.substring(0, actionId.indexOf("@"))).call(); - Thread.sleep(100); + checkCoordActionStatus(actionId, CoordinatorAction.Status.TIMEDOUT); checkCoordAction(actionId, missingDeps, CoordinatorAction.Status.TIMEDOUT); } @@ -776,7 +776,7 @@ public class TestCoordActionInputCheckXCommand extends XDataTestCase { catch (Exception e) { assertTrue(e.getMessage().contains("No FileSystem for scheme")); } - Thread.sleep(100); + checkCoordActionStatus(actionId, CoordinatorAction.Status.TIMEDOUT); checkCoordAction(actionId, missingDeps, CoordinatorAction.Status.TIMEDOUT); } http://git-wip-us.apache.org/repos/asf/oozie/blob/62e61615/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 40b698b..b56bb5e 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.3.0 release (trunk - unreleased) +OOZIE-2577 Flaky tests TestCoordActionInputCheckXCommand.testTimeout and testTimeoutWithException (pbacsko via rkanter) OOZIE-2570 remove -PtestPatchCompile from patch testing as there is no such profile (gezapeti via rkanter) OOZIE-2504 Create a log4j.properties under HADOOP_CONF_DIR in Shell Action (harsh) OOZIE-2567 HCat connection is not closed while getting hcat cred (puru)
