From bf8c4b289a4beabd6fb7bd28b8cfad50c9b62998 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Thu, 30 Jan 2014 11:36:54 -0500 Subject: [PATCH] Don't raise an exception at the end of a task if we are running unit tests --- awx/main/models/jobs.py | 1 - awx/main/tasks.py | 2 +- awx/main/tests/base.py | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py index e0a94d82d3..6e53675363 100644 --- a/awx/main/models/jobs.py +++ b/awx/main/models/jobs.py @@ -391,7 +391,6 @@ class Job(CommonTask): dependent_tasks = [{'type': r['type'], 'id': r['obj'].id} for r in runnable_tasks[idx:]] + [thisjob] run_tasks.append(runnable_tasks[idx]['sig'].set(link_error=handle_work_error.s(subtasks=dependent_tasks))) run_tasks.append(task_class().si(self.pk, **opts).set(link_error=handle_work_error.s(subtasks=[thisjob]))) - print runnable_tasks res = chain(run_tasks)() return True diff --git a/awx/main/tasks.py b/awx/main/tasks.py index 2b83597204..6f7778afe3 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -307,7 +307,7 @@ class BaseTask(Task): result_traceback=tb, output_replacements=output_replacements) self.post_run_hook(instance, **kwargs) - if status != 'successful': + if status != 'successful' and not has hasattr(settings, 'CELERY_UNIT_TEST'): # Raising an exception will mark the job as 'failed' in celery # and will stop a task chain from continuing to execute raise Exception("Task %s(pk:%s) encountered an error" % (str(self.model.__class__), str(pk))) diff --git a/awx/main/tests/base.py b/awx/main/tests/base.py index fc96dc6366..23f851d6e9 100644 --- a/awx/main/tests/base.py +++ b/awx/main/tests/base.py @@ -52,6 +52,7 @@ class BaseTestMixin(object): # callbacks. if settings.BROKER_URL.startswith('amqp://'): settings.BROKER_URL = 'django://' + settings.CELERY_UNIT_TEST = True # Make temp job status directory for unit tests. job_status_dir = tempfile.mkdtemp() self._temp_project_dirs.append(job_status_dir)