From a9365a3967f16886bd9b450109f39a40bb0d0965 Mon Sep 17 00:00:00 2001 From: chris meyers Date: Thu, 11 Oct 2018 13:40:54 -0400 Subject: [PATCH] code cleanup --- awx/main/scheduler/dag_workflow.py | 7 +++---- awx/main/tests/functional/models/test_workflow.py | 2 -- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/awx/main/scheduler/dag_workflow.py b/awx/main/scheduler/dag_workflow.py index b49cf185e9..510e87cf44 100644 --- a/awx/main/scheduler/dag_workflow.py +++ b/awx/main/scheduler/dag_workflow.py @@ -133,10 +133,9 @@ class WorkflowDAG(SimpleDAG): nodes.extend(children_all) elif job and job.status == 'failed': children_failed = self.get_dependencies(obj, 'success_nodes') - children_all = children_failed - nodes.extend(children_all) + nodes.extend(children_failed) elif job and job.status == 'successful': children_success = self.get_dependencies(obj, 'failure_nodes') - children_all = children_success - nodes.extend(children_all) + nodes.extend(children_success) return [n['node_object'] for n in nodes_marked_do_not_run] + diff --git a/awx/main/tests/functional/models/test_workflow.py b/awx/main/tests/functional/models/test_workflow.py index cc44a9b621..f406085aca 100644 --- a/awx/main/tests/functional/models/test_workflow.py +++ b/awx/main/tests/functional/models/test_workflow.py @@ -102,8 +102,6 @@ class TestWorkflowDAGFunctional(TransactionTestCase): @pytest.mark.django_db class TestWorkflowDNR(): - 'success', 'new' - @pytest.fixture def workflow_job_fn(self): def fn(states=['new', 'new', 'new', 'new', 'new', 'new']):