From 7b288ef98a1d3ecce608a0660db0c58b8a3501ec Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 13 Feb 2018 10:52:14 -0500 Subject: [PATCH] Tweak celery-related messages. --- awx/main/scheduler/task_manager.py | 4 ++-- awx/main/tests/functional/task_management/test_scheduler.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/awx/main/scheduler/task_manager.py b/awx/main/scheduler/task_manager.py index bc64ca81fa..f0c686cd1f 100644 --- a/awx/main/scheduler/task_manager.py +++ b/awx/main/scheduler/task_manager.py @@ -485,13 +485,13 @@ class TaskManager(): task.job_explanation += ' '.join(( 'Task was marked as running in Tower but its ', 'controller management daemon was not present in', - 'Celery, so it has been marked as failed.', + 'the job queue, so it has been marked as failed.', 'Task may still be running, but contactability is unknown.' )) else: task.job_explanation += ' '.join(( 'Task was marked as running in Tower but was not present in', - 'Celery, so it has been marked as failed.', + 'the job queue, so it has been marked as failed.', )) try: task.save(update_fields=['status', 'start_args', 'job_explanation']) diff --git a/awx/main/tests/functional/task_management/test_scheduler.py b/awx/main/tests/functional/task_management/test_scheduler.py index 9a1ece8ee9..d32f9daa2b 100644 --- a/awx/main/tests/functional/task_management/test_scheduler.py +++ b/awx/main/tests/functional/task_management/test_scheduler.py @@ -344,7 +344,7 @@ class TestReaper(): j.websocket_emit_status.assert_called_once_with('failed') assert j.status == 'failed' assert j.job_explanation == ( - 'Task was marked as running in Tower but was not present in Celery, so it has been marked as failed.' + 'Task was marked as running in Tower but was not present in the job queue, so it has been marked as failed.' ) @pytest.mark.django_db