From e0b72ff452bf46c3ce1a245ea7bba28a92f2cfd8 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Mon, 17 Mar 2014 11:24:44 -0400 Subject: [PATCH] Make sure we ignore the wait update for tasks under dependency situations in the unit tests --- awx/main/tests/inventory.py | 1 + awx/main/tests/projects.py | 1 + 2 files changed, 2 insertions(+) diff --git a/awx/main/tests/inventory.py b/awx/main/tests/inventory.py index 977d8970a9..ecf3fe580e 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, + UNIT_TEST_IGNORE_TASK_WAIT=True, PEXPECT_TIMEOUT=60) class InventoryUpdatesTest(BaseTransactionTest): diff --git a/awx/main/tests/projects.py b/awx/main/tests/projects.py index d4cf76f8ed..36c5c9b8f9 100644 --- a/awx/main/tests/projects.py +++ b/awx/main/tests/projects.py @@ -674,6 +674,7 @@ class ProjectsTest(BaseTest): @override_settings(CELERY_ALWAYS_EAGER=True, CELERY_EAGER_PROPAGATES_EXCEPTIONS=True, ANSIBLE_TRANSPORT='local', + UNIT_TEST_IGNORE_TASK_WAIT=True PROJECT_UPDATE_IDLE_TIMEOUT=60, PROJECT_UPDATE_VVV=True) class ProjectUpdatesTest(BaseTransactionTest):