From 7fe474aec523bfd7fba7c4910b9a5c0c813f0a6b Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Tue, 18 Mar 2014 12:02:14 -0400 Subject: [PATCH] Prevent deadlocks on unit tests in a very specific scenario --- awx/main/management/commands/run_task_system.py | 2 +- awx/main/tests/inventory.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/awx/main/management/commands/run_task_system.py b/awx/main/management/commands/run_task_system.py index 3291628a62..db9745e6a7 100644 --- a/awx/main/management/commands/run_task_system.py +++ b/awx/main/management/commands/run_task_system.py @@ -143,7 +143,7 @@ def rebuild_graph(message): ''' Regenerate the task graph by refreshing known tasks from Tower, purging orphaned running tasks, and creatingdependencies for new tasks before generating directed edge relationships between those tasks ''' inspector = inspect() - if not hasattr(settings, 'UNIT_TEST_IGNORE_TASK_WAIT'): + if not hasattr(settings, 'IGNORE_CELERY_INSPECTOR'): active_task_queues = inspector.active() else: print("Ignoring celery task inspector") diff --git a/awx/main/tests/inventory.py b/awx/main/tests/inventory.py index ecf3fe580e..f0baecd0de 100644 --- a/awx/main/tests/inventory.py +++ b/awx/main/tests/inventory.py @@ -977,6 +977,7 @@ class InventoryTest(BaseTest): @override_settings(CELERY_ALWAYS_EAGER=True, CELERY_EAGER_PROPAGATES_EXCEPTIONS=True, + IGNORE_CELERY_INSPECTOR=True UNIT_TEST_IGNORE_TASK_WAIT=True, PEXPECT_TIMEOUT=60) class InventoryUpdatesTest(BaseTransactionTest):