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

Do not return from the graph building routine if we are in celery debug mode.

Browse Source
This commit is contained in:
Matthew Jones
2014-03-12 17:54:29 -04:00
parent fc4f256723
commit c8534055ef
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/management/commands/run_task_system.py
View File

@@ -152,7 +152,8 @@ def rebuild_graph(message):
if settings.DEBUG: if settings.DEBUG:
print("Could not communicate with celery!") print("Could not communicate with celery!")
# TODO: Something needs to be done here to signal to the system as a whole that celery appears to be down # TODO: Something needs to be done here to signal to the system as a whole that celery appears to be down
return None if not hasattr(settings, 'CELERY_UNIT_TEST'):
return None
all_sorted_tasks = get_tasks() all_sorted_tasks = get_tasks()
if not len(all_sorted_tasks): if not len(all_sorted_tasks):
return None return None

2
awx/main/tests/base.py
View File

@@ -62,7 +62,7 @@ class BaseTestMixin(object):
callback_queue_path = '/tmp/callback_receiver_test_%d.ipc' % callback_port callback_queue_path = '/tmp/callback_receiver_test_%d.ipc' % callback_port
self._temp_project_dirs.append(callback_queue_path) self._temp_project_dirs.append(callback_queue_path)
settings.CALLBACK_QUEUE_PORT = 'ipc://%s' % callback_queue_path settings.CALLBACK_QUEUE_PORT = 'ipc://%s' % callback_queue_path
settings.CALLBACK_COMMAND_PORT = 'ipc:///tmp/task_command_receiver_%d.ipc' % callback_port settings.TASK_COMMAND_PORT = 'ipc:///tmp/task_command_receiver_%d.ipc' % callback_port
# Make temp job status directory for unit tests. # Make temp job status directory for unit tests.
job_status_dir = tempfile.mkdtemp() job_status_dir = tempfile.mkdtemp()
self._temp_project_dirs.append(job_status_dir) self._temp_project_dirs.append(job_status_dir)