azkaban-aplcache

Fix flaky test of runFlowOnJobStatusConditionNull (#1940) The

8/31/2018 5:56:04 PM
3.55.0

Details

diff --git a/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerConditionalFlowTest.java b/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerConditionalFlowTest.java
index a87a5e1..f5b0414 100644
--- a/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerConditionalFlowTest.java
+++ b/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerConditionalFlowTest.java
@@ -147,11 +147,10 @@ public class FlowRunnerConditionalFlowTest extends FlowRunnerTestBase {
     setUp(CONDITIONAL_FLOW_3, flowProps);
     final ExecutableFlow flow = this.runner.getExecutableFlow();
     flow.getExecutableNode("jobC").setConditionOnJobStatus(null);
-    InteractiveTestJob.getTestJob("jobA").failJob();
-    assertStatus(flow, "jobA", Status.FAILED);
+    assertStatus(flow, "jobA", Status.SUCCEEDED);
     assertStatus(flow, "jobB", Status.SUCCEEDED);
-    assertStatus(flow, "jobC", Status.CANCELLED);
-    assertFlowStatus(flow, Status.FAILED);
+    assertStatus(flow, "jobC", Status.SUCCEEDED);
+    assertFlowStatus(flow, Status.SUCCEEDED);
   }
 
   /**
diff --git a/test/execution-test-data/conditionalflowyamltest/conditional_flow3.flow b/test/execution-test-data/conditionalflowyamltest/conditional_flow3.flow
index 43956e6..08eae54 100644
--- a/test/execution-test-data/conditionalflowyamltest/conditional_flow3.flow
+++ b/test/execution-test-data/conditionalflowyamltest/conditional_flow3.flow
@@ -16,6 +16,9 @@ nodes:
 
   - name: jobA
     type: test
+    config:
+      fail: false
+      seconds: 0
 
   - name: jobB
     type: test