From c8534055ef57f3eddef3bdeecfbb417b419409f4 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Wed, 12 Mar 2014 17:54:29 -0400 Subject: [PATCH] Do not return from the graph building routine if we are in celery debug mode. --- awx/main/management/commands/run_task_system.py | 3 ++- awx/main/tests/base.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/awx/main/management/commands/run_task_system.py b/awx/main/management/commands/run_task_system.py index 8e284412a1..049432da83 100644 --- a/awx/main/management/commands/run_task_system.py +++ b/awx/main/management/commands/run_task_system.py @@ -152,7 +152,8 @@ def rebuild_graph(message): if settings.DEBUG: 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 - return None + if not hasattr(settings, 'CELERY_UNIT_TEST'): + return None all_sorted_tasks = get_tasks() if not len(all_sorted_tasks): return None diff --git a/awx/main/tests/base.py b/awx/main/tests/base.py index 04cc9bcffc..d98df261e5 100644 --- a/awx/main/tests/base.py +++ b/awx/main/tests/base.py @@ -62,7 +62,7 @@ class BaseTestMixin(object): callback_queue_path = '/tmp/callback_receiver_test_%d.ipc' % callback_port self._temp_project_dirs.append(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. job_status_dir = tempfile.mkdtemp() self._temp_project_dirs.append(job_status_dir)