OOZIE-2379 org.apache.oozie.command.coord.TestCoordPushDependencyCheckXCommand.testRequeueOnException 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/5e2b9264 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/5e2b9264 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/5e2b9264 Branch: refs/heads/master Commit: 5e2b92648762d185bcf6165c1312540ad81ca1b2 Parents: 5979b4d Author: Robert Kanter <[email protected]> Authored: Thu Oct 1 10:36:11 2015 -0700 Committer: Robert Kanter <[email protected]> Committed: Thu Oct 1 10:36:11 2015 -0700 ---------------------------------------------------------------------- .../command/coord/TestCoordPushDependencyCheckXCommand.java | 4 ++-- release-log.txt | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/5e2b9264/core/src/test/java/org/apache/oozie/command/coord/TestCoordPushDependencyCheckXCommand.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/command/coord/TestCoordPushDependencyCheckXCommand.java b/core/src/test/java/org/apache/oozie/command/coord/TestCoordPushDependencyCheckXCommand.java index 22abeb3..25f250c 100644 --- a/core/src/test/java/org/apache/oozie/command/coord/TestCoordPushDependencyCheckXCommand.java +++ b/core/src/test/java/org/apache/oozie/command/coord/TestCoordPushDependencyCheckXCommand.java @@ -399,8 +399,8 @@ public class TestCoordPushDependencyCheckXCommand extends XDataTestCase { assertEquals(1, callableQueueService.getQueueDump().size()); assertTrue(queueDump.get(0).contains("coord_push_dep_check")); log.info("Queue dump is " + queueDump.toString()); - // Delay should be something like delay=599999. Ignore last three digits - assertTrue(queueDump.get(0).matches(".* delay=599[0-9]{3}")); + // Delay should be something like delay=599999 (ignore last three digits) or delay=600000 + assertTrue(queueDump.get(0).matches(".* delay=(599[0-9]{3}|600000)")); } @Test http://git-wip-us.apache.org/repos/asf/oozie/blob/5e2b9264/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 05a8f48..037d4bb 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.3.0 release (trunk - unreleased) +OOZIE-2379 org.apache.oozie.command.coord.TestCoordPushDependencyCheckXCommand.testRequeueOnException is flakey (rkanter) OOZIE-2378 org.apache.oozie.client.TestOozieCLI.testAdminInstrumentation is flakey (rkanter) OOZIE-2377 Hive2 Action should not propagate oozie.hive2.* properties to Beeline (rkanter) OOZIE-2376 Default action configs not honored if no <configuration> section in workflow (rkanter)
