OOZIE-2379 org.apache.oozie.command.coord.TestCoordPushDependencyChec…

…kXCommand.testRequeueOnException is flakey (rkanter)
apache · Oct 1, 2015 · 5e2b926 · 5e2b926
1 parent 5979b4d
commit 5e2b926
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
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
@@ -399,8 +399,8 @@ public void testRequeueOnException() throws Exception {
         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

diff --git 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)