External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-25 21:05:03 -02:30
Code Issues Packages Projects Releases Wiki Activity

code cleanup

Browse Source
This commit is contained in:
chris meyers
2018-10-11 13:40:54 -04:00
parent c18bd274c9
commit ded557cc0a
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/scheduler/dag_workflow.py
View File

@@ -133,11 +133,9 @@ class WorkflowDAG(SimpleDAG):
nodes.extend(children_all) nodes.extend(children_all)
elif job and job.status == 'failed': elif job and job.status == 'failed':
children_failed = self.get_dependencies(obj, 'success_nodes') children_failed = self.get_dependencies(obj, 'success_nodes')
children_all = children_failed nodes.extend(children_failed)
nodes.extend(children_all)
elif job and job.status == 'successful': elif job and job.status == 'successful':
children_success = self.get_dependencies(obj, 'failure_nodes') children_success = self.get_dependencies(obj, 'failure_nodes')
children_all = children_success nodes.extend(children_success)
nodes.extend(children_all)
return [n['node_object'] for n in nodes_marked_do_not_run] return [n['node_object'] for n in nodes_marked_do_not_run]

2
awx/main/tests/functional/models/test_workflow.py
View File

@@ -102,8 +102,6 @@ class TestWorkflowDAGFunctional(TransactionTestCase):
@pytest.mark.django_db @pytest.mark.django_db
class TestWorkflowDNR(): class TestWorkflowDNR():
'success', 'new'
@pytest.fixture @pytest.fixture
def workflow_job_fn(self): def workflow_job_fn(self):
def fn(states=['new', 'new', 'new', 'new', 'new', 'new']): def fn(states=['new', 'new', 'new', 'new', 'new', 'new']):