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

Update EC2 inventory import to use any variables defined in source_vars. Fix AC-565 by setting default regions_exclude to us-gov-west1 (same as default ec2.ini). Fix AC-566 by stripping extra whitespace from comma-separated region names.

Browse Source
This commit is contained in:
Chris Church
2013-10-16 23:05:51 -04:00
parent a11f25a68d
commit 432ed60a1f
3 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -942,7 +942,8 @@ class InventoryTest(BaseTest):
set([g_e.pk]))
@override_settings(CELERY_ALWAYS_EAGER=True,
CELERY_EAGER_PROPAGATES_EXCEPTIONS=True)
CELERY_EAGER_PROPAGATES_EXCEPTIONS=True,
PEXPECT_TIMEOUT=60)
class InventoryUpdatesTest(BaseTransactionTest):
def setUp(self):