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

expanded unit test to include 3 root nodes meeting on a convergence node and successfully marking that to node.

Browse Source
This commit is contained in:
Rebeccah
2020-02-05 14:11:37 -05:00
parent 63ae2cac38
commit fdc29eebb7
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
awx/main/tests/unit/scheduler/test_dag_workflow.py
View File

@@ -95,7 +95,7 @@ class TestDNR():
(g, nodes) = workflow_dag_1 (g, nodes) = workflow_dag_1
r''' r'''
S0 0
/\ /\
S / \ S / \
/ \ / \
@@ -114,7 +114,7 @@ class TestDNR():
assert 0 == len(do_not_run_nodes) assert 0 == len(do_not_run_nodes)
r''' r'''
S0 0
/\ /\
S / \ S / \
/ \ / \
@@ -301,10 +301,10 @@ class TestAllWorkflowNodes():
nodes[0].job = Job(status='successful') nodes[0].job = Job(status='successful')
nodes[1].job = Job(status='running') nodes[1].job = Job(status='running')
nodes[2].job = Job(status='failure') nodes[2].job = Job(status='failed')
return (g, nodes) return (g, nodes)
def test_workflow_all_converge_will_run(self, workflow_all_converge_dnr): def test_workflow_all_converge_while_parent_runs(self, workflow_all_converge_dnr):
(g, nodes) = workflow_all_converge_dnr (g, nodes) = workflow_all_converge_dnr
dnr_nodes = g.mark_dnr_nodes() dnr_nodes = g.mark_dnr_nodes()
assert 0 == len(dnr_nodes), "No nodes should get marked DNR" assert 0 == len(dnr_nodes), "No nodes should get marked DNR"
@@ -312,7 +312,9 @@ class TestAllWorkflowNodes():
nodes_to_run = g.bfs_nodes_to_run() nodes_to_run = g.bfs_nodes_to_run()
assert 0 == len(nodes_to_run), "No nodes should run yet" assert 0 == len(nodes_to_run), "No nodes should run yet"
def test_workflow_all_converge_with_incorrect_parent(self, workflow_all_converge_dnr):
# Another tick of the scheduler # Another tick of the scheduler
(g, nodes) = workflow_all_converge_dnr
nodes[1].job.status = 'successful' nodes[1].job.status = 'successful'
dnr_nodes = g.mark_dnr_nodes() dnr_nodes = g.mark_dnr_nodes()
assert 1 == len(dnr_nodes), "1 and only 1 node should be marked DNR" assert 1 == len(dnr_nodes), "1 and only 1 node should be marked DNR"
@@ -321,6 +323,16 @@ class TestAllWorkflowNodes():
nodes_to_run = g.bfs_nodes_to_run() nodes_to_run = g.bfs_nodes_to_run()
assert 0 == len(nodes_to_run), "Convergence node should NOT be chosen to run because it is DNR" assert 0 == len(nodes_to_run), "Convergence node should NOT be chosen to run because it is DNR"
def test_workflow_all_converge_runs(self, workflow_all_converge_dnr):
# Trick the scheduler again to make sure the convergence node acutally runs
(g, nodes) = workflow_all_converge_dnr
nodes[1].job.status = 'failed'
dnr_nodes = g.mark_dnr_nodes()
assert 0 == len(dnr_nodes), "No nodes should be marked DNR"
nodes_to_run = g.bfs_nodes_to_run()
assert 1 == len(nodes_to_run), "Convergence node should be chosen to run"
@pytest.fixture @pytest.fixture
def workflow_all_converge_deep_dnr_tree(self, wf_node_generator): def workflow_all_converge_deep_dnr_tree(self, wf_node_generator):
g = WorkflowDAG() g = WorkflowDAG()
@@ -342,7 +354,7 @@ class TestAllWorkflowNodes():
\ / \ /
S \ / S S \ / S
\/ \/
6 6
''' '''
g.add_edge(nodes[0], nodes[3], "success_nodes") g.add_edge(nodes[0], nodes[3], "success_nodes")
g.add_edge(nodes[1], nodes[3], "success_nodes") g.add_edge(nodes[1], nodes[3], "success_nodes")