Author: virag
Date: Tue Oct 2 17:42:29 2012
New Revision: 1393059
URL: http://svn.apache.org/viewvc?rev=1393059&view=rev
Log:
OOZIE-1005 Tests from OOZIE-994 use wrong condition in waitFor (rkanter via
virag)
Modified:
oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
oozie/trunk/release-log.txt
Modified:
oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java?rev=1393059&r1=1393058&r2=1393059&view=diff
==============================================================================
---
oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
(original)
+++
oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
Tue Oct 2 17:42:29 2012
@@ -268,11 +268,18 @@ public class TestActionCheckXCommand ext
assertEquals(0, action1.getRetries());
new ActionCheckXCommand(actionId).call();
+ waitFor(30 * 1000, new Predicate() {
+ @Override
+ public boolean evaluate() throws Exception {
+ WorkflowActionBean action1a =
jpaService.execute(wfActionGetCmd);
+ return (action1a.getRetries() > 0);
+ }
+ });
waitFor(180 * 1000, new Predicate() {
@Override
public boolean evaluate() throws Exception {
WorkflowActionBean action1a =
jpaService.execute(wfActionGetCmd);
- return (action1a.getRetries() == maxRetries + 1);
+ return (action1a.getRetries() == 0);
}
});
WorkflowActionBean action1b =
jpaService.execute(wfActionGetCmd);
@@ -390,11 +397,18 @@ public class TestActionCheckXCommand ext
assertEquals(0, action1.getRetries());
new ActionCheckXCommand(actionId).call();
+ waitFor(30 * 1000, new Predicate() {
+ @Override
+ public boolean evaluate() throws Exception {
+ WorkflowActionBean action1a =
jpaService.execute(wfActionGetCmd);
+ return (action1a.getRetries() > 0);
+ }
+ });
waitFor(180 * 1000, new Predicate() {
@Override
public boolean evaluate() throws Exception {
WorkflowActionBean action1a =
jpaService.execute(wfActionGetCmd);
- return (action1a.getRetries() == maxRetries + 1);
+ return (action1a.getRetries() == 0);
}
});
WorkflowActionBean action1b =
jpaService.execute(wfActionGetCmd);
Modified: oozie/trunk/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1393059&r1=1393058&r2=1393059&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Tue Oct 2 17:42:29 2012
@@ -1,5 +1,6 @@
-- Oozie 3.4.0 release (trunk - unreleased)
+OOZIE-1005 Tests from OOZIE-994 use wrong condition in waitFor (rkanter via
virag)
OOZIE-992 Add overall status to test-patch messages and add some color-coding
for negative results (tucu)
OOZIE-1003 TestOozieCLI.testSubmitDoAs() should disable anonymous request
(tucu)
OOZIE-1004 Oozie client needs to bundle slf4j JARs (tucu)
