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

Make sure we ignore the wait update for tasks under dependency

Browse Source 
situations in the unit tests
This commit is contained in:
Matthew Jones
2014-03-17 11:24:44 -04:00
parent f6ac7fb6d0
commit e0b72ff452
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -977,6 +977,7 @@ class InventoryTest(BaseTest):
@override_settings(CELERY_ALWAYS_EAGER=True, @override_settings(CELERY_ALWAYS_EAGER=True,
CELERY_EAGER_PROPAGATES_EXCEPTIONS=True, CELERY_EAGER_PROPAGATES_EXCEPTIONS=True,
UNIT_TEST_IGNORE_TASK_WAIT=True,
PEXPECT_TIMEOUT=60) PEXPECT_TIMEOUT=60)
class InventoryUpdatesTest(BaseTransactionTest): class InventoryUpdatesTest(BaseTransactionTest):

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

@@ -674,6 +674,7 @@ class ProjectsTest(BaseTest):
@override_settings(CELERY_ALWAYS_EAGER=True, @override_settings(CELERY_ALWAYS_EAGER=True,
CELERY_EAGER_PROPAGATES_EXCEPTIONS=True, CELERY_EAGER_PROPAGATES_EXCEPTIONS=True,
ANSIBLE_TRANSPORT='local', ANSIBLE_TRANSPORT='local',
UNIT_TEST_IGNORE_TASK_WAIT=True
PROJECT_UPDATE_IDLE_TIMEOUT=60, PROJECT_UPDATE_IDLE_TIMEOUT=60,
PROJECT_UPDATE_VVV=True) PROJECT_UPDATE_VVV=True)
class ProjectUpdatesTest(BaseTransactionTest): class ProjectUpdatesTest(BaseTransactionTest):