External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-17 04:31:21 -03:30
Code Issues Packages Projects Releases Wiki Activity

Prevent deadlocks on unit tests in a very specific scenario

Browse Source
This commit is contained in:
Matthew Jones 2014-03-18 12:02:14 -04:00
parent fe625785c7
commit 7fe474aec5
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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")

1
awx/main/tests/inventory.py
View File

@ -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):