From e2fb83db9857b21ab7f26f3819da563c8dbe050f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 20 Feb 2020 17:10:13 -0500 Subject: [PATCH] Tweak workflow error message --- awx/main/scheduler/dag_workflow.py | 4 ++-- .../tests/unit/scheduler/test_dag_workflow.py | 20 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/awx/main/scheduler/dag_workflow.py b/awx/main/scheduler/dag_workflow.py index 739b1b95e6..3d26a4da7f 100644 --- a/awx/main/scheduler/dag_workflow.py +++ b/awx/main/scheduler/dag_workflow.py @@ -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': '', diff --git a/awx/main/tests/unit/scheduler/test_dag_workflow.py b/awx/main/tests/unit/scheduler/test_dag_workflow.py index 8bc0d8e841..aaec50191a 100644 --- a/awx/main/tests/unit/scheduler/test_dag_workflow.py +++ b/awx/main/tests/unit/scheduler/test_dag_workflow.py @@ -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():