From c1171fe4ffb08023a873c8bd6fe6b0b854c37f27 Mon Sep 17 00:00:00 2001
From: chris meyers <chris.meyers.fsu@gmail.com>
Date: Thu, 15 Nov 2018 14:07:11 -0500
Subject: [PATCH] treat canceled nodes as failed when processing wf

* When deciding what jobs to run next, treat canceled as failed.
* Also add tests.
---
 awx/main/scheduler/dag_workflow.py            |  2 +-
 .../tests/unit/scheduler/test_dag_workflow.py | 61 +++++++++++++++++++
 2 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/awx/main/scheduler/dag_workflow.py b/awx/main/scheduler/dag_workflow.py
index 05b45d3184..854fb16dc7 100644
--- a/awx/main/scheduler/dag_workflow.py
+++ b/awx/main/scheduler/dag_workflow.py
@@ -71,7 +71,7 @@ class WorkflowDAG(SimpleDAG):
                 return False
 
             # Node decidedly got a job; check if job is done
-            if p.job and p.job.status not in ['successful', 'failed', 'error']:
+            if p.job and p.job.status not in ['successful', 'failed', 'error', 'canceled']:
                 return False
         return True
 
diff --git a/awx/main/tests/unit/scheduler/test_dag_workflow.py b/awx/main/tests/unit/scheduler/test_dag_workflow.py
index 15f4e3a5bc..adcae3c748 100644
--- a/awx/main/tests/unit/scheduler/test_dag_workflow.py
+++ b/awx/main/tests/unit/scheduler/test_dag_workflow.py
@@ -208,3 +208,64 @@ class TestIsWorkflowDone():
 
         assert g.is_workflow_done() is True
         assert g.has_workflow_failed() is True
+
+class TestHasWorkflowFailed():
+    @pytest.fixture
+    def WorkflowNodeClass(self):
+        return WorkflowNodeBase
+
+    @pytest.fixture
+    def workflow_dag_canceled(self, wf_node_generator):
+        g = WorkflowDAG()
+        nodes = [wf_node_generator() for i in range(1)]
+        map(lambda n: g.add_node(n), nodes)
+        r'''
+               F0
+        '''
+        nodes[0].job = Job(status='canceled')
+        return (g, nodes)
+
+    @pytest.fixture
+    def workflow_dag_failure(self, workflow_dag_canceled):
+        (g, nodes) = workflow_dag_canceled
+        nodes[0].job.status = 'failed'
+        return (g, nodes)
+
+    def test_canceled_should_fail(self, workflow_dag_canceled):
+        (g, nodes) = workflow_dag_canceled
+
+        assert g.has_workflow_failed() is True
+
+    def test_failure_should_fail(self, workflow_dag_failure):
+        (g, nodes) = workflow_dag_failure
+
+        assert g.has_workflow_failed() is True
+
+
+class TestBFSNodesToRun():
+    @pytest.fixture
+    def WorkflowNodeClass(self):
+        return WorkflowNodeDNR
+
+    @pytest.fixture
+    def workflow_dag_canceled(self, wf_node_generator):
+        g = WorkflowDAG()
+        nodes = [wf_node_generator() for i in range(4)]
+        map(lambda n: g.add_node(n), nodes)
+        r'''
+               C0
+              / | \
+           F / A|  \ S
+            /   |   \
+           1    2    3
+        '''
+        g.add_edge(nodes[0], nodes[1], "failure_nodes")
+        g.add_edge(nodes[0], nodes[2], "always_nodes")
+        g.add_edge(nodes[0], nodes[3], "success_nodes")
+        nodes[0].job = Job(status='canceled')
+        return (g, nodes)
+
+    def test_cancel_still_runs_children(self, workflow_dag_canceled):
+        (g, nodes) = workflow_dag_canceled
+
+        assert set([nodes[1], nodes[2]]) == set(g.bfs_nodes_to_run())