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

Merge pull request #6022 from wenottingham/get-a-handle

Browse Source 
Tweak workflow error message for clarity

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot] 2020-02-21 15:37:57 +00:00 committed by GitHub
commit a42ff9865b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -167,8 +167,8 @@ class WorkflowDAG(SimpleDAG):
failed_path_nodes_id_status.append((str(obj.id), obj.job.status))
if res is True:
s = _("No error handle path for workflow job node(s) [{node_status}] workflow job "
"node(s) missing unified job template and error handle path [{no_ufjt}].")
s = _("No error handling path for workflow job node(s) [{node_status}]. Workflow job "
"node(s) missing unified job template and error handling path [{no_ufjt}].")
parms = {
'node_status': '',
'no_ufjt': '',

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

@ -467,8 +467,8 @@ class TestIsWorkflowDone():
assert g.is_workflow_done() is True
assert g.has_workflow_failed() == \
(True, smart_text(_("No error handle path for workflow job node(s) [({},{})] workflow job node(s)"
" missing unified job template and error handle path [].").format(nodes[2].id, nodes[2].job.status)))
(True, smart_text(_("No error handling path for workflow job node(s) [({},{})]. Workflow job node(s)"
" missing unified job template and error handling path [].").format(nodes[2].id, nodes[2].job.status)))
def test_is_workflow_done_no_unified_job_tempalte_end(self, workflow_dag_failed):
(g, nodes) = workflow_dag_failed
@ -477,8 +477,8 @@ class TestIsWorkflowDone():
assert g.is_workflow_done() is True
assert g.has_workflow_failed() == \
(True, smart_text(_("No error handle path for workflow job node(s) [] workflow job node(s) missing"
" unified job template and error handle path [{}].").format(nodes[2].id)))
(True, smart_text(_("No error handling path for workflow job node(s) []. Workflow job node(s) missing"
" unified job template and error handling path [{}].").format(nodes[2].id)))
def test_is_workflow_done_no_unified_job_tempalte_begin(self, workflow_dag_1):
(g, nodes) = workflow_dag_1
@ -488,22 +488,22 @@ class TestIsWorkflowDone():
assert g.is_workflow_done() is True
assert g.has_workflow_failed() == \
(True, smart_text(_("No error handle path for workflow job node(s) [] workflow job node(s) missing"
" unified job template and error handle path [{}].").format(nodes[0].id)))
(True, smart_text(_("No error handling path for workflow job node(s) []. Workflow job node(s) missing"
" unified job template and error handling path [{}].").format(nodes[0].id)))
def test_canceled_should_fail(self, workflow_dag_canceled):
(g, nodes) = workflow_dag_canceled
assert g.has_workflow_failed() == \
(True, smart_text(_("No error handle path for workflow job node(s) [({},{})] workflow job node(s)"
" missing unified job template and error handle path [].").format(nodes[0].id, nodes[0].job.status)))
(True, smart_text(_("No error handling path for workflow job node(s) [({},{})]. Workflow job node(s)"
" missing unified job template and error handling path [].").format(nodes[0].id, nodes[0].job.status)))
def test_failure_should_fail(self, workflow_dag_failure):
(g, nodes) = workflow_dag_failure
assert g.has_workflow_failed() == \
(True, smart_text(_("No error handle path for workflow job node(s) [({},{})] workflow job node(s)"
" missing unified job template and error handle path [].").format(nodes[0].id, nodes[0].job.status)))
(True, smart_text(_("No error handling path for workflow job node(s) [({},{})]. Workflow job node(s)"
" missing unified job template and error handling path [].").format(nodes[0].id, nodes[0].job.status)))
class TestBFSNodesToRun():