From 214c27a5cfe2e08fd462f77eb0d5c2de5b2eeb09 Mon Sep 17 00:00:00 2001 From: sean-m-ssullivan Date: Thu, 10 Jun 2021 11:57:31 -0400 Subject: [PATCH] add job data to filed wait jobs --- .../plugins/module_utils/controller_api.py | 1 + awx_collection/test/awx/test_ad_hoc_wait.py | 13 ++++--------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/awx_collection/plugins/module_utils/controller_api.py b/awx_collection/plugins/module_utils/controller_api.py index 2cd98c5a5c..a5a33729eb 100644 --- a/awx_collection/plugins/module_utils/controller_api.py +++ b/awx_collection/plugins/module_utils/controller_api.py @@ -735,6 +735,7 @@ class ControllerAPIModule(ControllerModule): self.json_output['msg'] = 'Job with id {0} failed'.format(object_name) else: self.json_output['msg'] = 'The {0} - {1}, failed'.format(object_type, object_name) + self.json_output["job_data"] = result["json"] self.wait_output(result) self.fail_json(**self.json_output) diff --git a/awx_collection/test/awx/test_ad_hoc_wait.py b/awx_collection/test/awx/test_ad_hoc_wait.py index fb23d7ce77..a0ff55fe15 100644 --- a/awx_collection/test/awx/test_ad_hoc_wait.py +++ b/awx_collection/test/awx/test_ad_hoc_wait.py @@ -16,7 +16,8 @@ def test_ad_hoc_command_wait_successful(run_module, admin_user): result['elapsed'] = float(result['elapsed']) assert result.pop('finished', '')[:10] == str(command.finished)[:10] assert result.pop('started', '')[:10] == str(command.started)[:10] - assert result == {"status": "successful", "changed": False, "elapsed": command.elapsed, "id": command.id} + assert result.pop('status', "successful"), result + assert result.get('changed') is False @pytest.mark.django_db @@ -27,14 +28,8 @@ def test_ad_hoc_command_wait_failed(run_module, admin_user): result['elapsed'] = float(result['elapsed']) assert result.pop('finished', '')[:10] == str(command.finished)[:10] assert result.pop('started', '')[:10] == str(command.started)[:10] - assert result == { - "status": "failed", - "failed": True, - "changed": False, - "elapsed": command.elapsed, - "id": command.id, - "msg": "The ad hoc command - 1, failed", - } + assert result.get('changed') is False + assert result.pop('status', "failed"), result @pytest.mark.django_db