azkaban-aplcache

Fix flaky test runFlowOnJobStatusConditionNull_2 (#1955) *

9/14/2018 3:26:33 PM

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 f5b0414..8c098ad 100644
--- a/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerConditionalFlowTest.java
+++ b/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerConditionalFlowTest.java
@@ -147,7 +147,9 @@ public class FlowRunnerConditionalFlowTest extends FlowRunnerTestBase {
     setUp(CONDITIONAL_FLOW_3, flowProps);
     final ExecutableFlow flow = this.runner.getExecutableFlow();
     flow.getExecutableNode("jobC").setConditionOnJobStatus(null);
+    InteractiveTestJob.getTestJob("jobA").succeedJob();
     assertStatus(flow, "jobA", Status.SUCCEEDED);
+    InteractiveTestJob.getTestJob("jobB").succeedJob();
     assertStatus(flow, "jobB", Status.SUCCEEDED);
     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 08eae54..2004cd9 100644
--- a/test/execution-test-data/conditionalflowyamltest/conditional_flow3.flow
+++ b/test/execution-test-data/conditionalflowyamltest/conditional_flow3.flow
@@ -16,12 +16,6 @@ nodes:
 
   - name: jobA
     type: test
-    config:
-      fail: false
-      seconds: 0
 
   - name: jobB
     type: test
-    config:
-      fail: false
-      seconds: 0