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

Tweak celery-related messages.

Browse Source
This commit is contained in:
Bill Nottingham
2018-02-13 10:52:14 -05:00
parent 0268d575f8
commit 7b288ef98a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -485,13 +485,13 @@ class TaskManager():
task.job_explanation += ' '.join(( task.job_explanation += ' '.join((
'Task was marked as running in Tower but its ', 'Task was marked as running in Tower but its ',
'controller management daemon was not present in', '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.' 'Task may still be running, but contactability is unknown.'
)) ))
else: else:
task.job_explanation += ' '.join(( task.job_explanation += ' '.join((
'Task was marked as running in Tower but was not present in', '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: try:
task.save(update_fields=['status', 'start_args', 'job_explanation']) task.save(update_fields=['status', 'start_args', 'job_explanation'])

2
awx/main/tests/functional/task_management/test_scheduler.py
View File

@@ -344,7 +344,7 @@ class TestReaper():
j.websocket_emit_status.assert_called_once_with('failed') j.websocket_emit_status.assert_called_once_with('failed')
assert j.status == 'failed' assert j.status == 'failed'
assert j.job_explanation == ( 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 @pytest.mark.django_db