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

Fix failing rax unit test, nly check that enabled flag is set on hosts that were previously enabled insead of all hosts.

Browse Source
This commit is contained in:
Chris Church
2014-06-25 12:35:50 -04:00
parent 04f0ea409b
commit 3b9fe8b954
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1106,7 +1106,8 @@ class InventoryUpdatesTest(BaseTransactionTest):
pass # If should_fail is None, we don't care. pass # If should_fail is None, we don't care.
return inventory_update return inventory_update
def check_inventory_source(self, inventory_source, initial=True): def check_inventory_source(self, inventory_source, initial=True, enabled_host_pks=None):
enabled_host_pks = enabled_host_pks or set()
inventory_source = InventorySource.objects.get(pk=inventory_source.pk) inventory_source = InventorySource.objects.get(pk=inventory_source.pk)
inventory = inventory_source.group.inventory inventory = inventory_source.group.inventory
self.assertTrue(inventory_source.can_update) self.assertTrue(inventory_source.can_update)
@@ -1132,7 +1133,8 @@ class InventoryUpdatesTest(BaseTransactionTest):
source_pks = host.inventory_sources.values_list('pk', flat=True) source_pks = host.inventory_sources.values_list('pk', flat=True)
self.assertTrue(inventory_source.pk in source_pks) self.assertTrue(inventory_source.pk in source_pks)
self.assertTrue(host.has_inventory_sources) self.assertTrue(host.has_inventory_sources)
self.assertTrue(host.enabled) if host.pk in enabled_host_pks:
self.assertTrue(host.enabled)
# Make sure EC2 RDS hosts are excluded. # Make sure EC2 RDS hosts are excluded.
if inventory_source.source == 'ec2': if inventory_source.source == 'ec2':
self.assertFalse(re.match(r'^.+\.rds\.amazonaws\.com$', host.name, re.I), self.assertFalse(re.match(r'^.+\.rds\.amazonaws\.com$', host.name, re.I),
@@ -1413,12 +1415,13 @@ class InventoryUpdatesTest(BaseTransactionTest):
# Manually disable all hosts, verify a new update re-enables them. # Manually disable all hosts, verify a new update re-enables them.
# Also change the host name, and verify it is not deleted, but instead # Also change the host name, and verify it is not deleted, but instead
# updated because the instance ID matches. # updated because the instance ID matches.
enabled_host_pks = set(self.inventory.hosts.filter(enabled=True).values_list('pk', flat=True))
for host in self.inventory.hosts.all(): for host in self.inventory.hosts.all():
host.enabled = False host.enabled = False
host.name = 'changed-%s' % host.name host.name = 'changed-%s' % host.name
host.save() host.save()
old_host_pks = set(self.inventory.hosts.values_list('pk', flat=True)) old_host_pks = set(self.inventory.hosts.values_list('pk', flat=True))
self.check_inventory_source(inventory_source, initial=False) self.check_inventory_source(inventory_source, initial=False, enabled_host_pks=enabled_host_pks)
new_host_pks = set(self.inventory.hosts.values_list('pk', flat=True)) new_host_pks = set(self.inventory.hosts.values_list('pk', flat=True))
self.assertEqual(old_host_pks, new_host_pks) self.assertEqual(old_host_pks, new_host_pks)
# Verify that main group is in top level groups (hasn't been added as # Verify that main group is in top level groups (hasn't been added as
@@ -1459,12 +1462,13 @@ class InventoryUpdatesTest(BaseTransactionTest):
# Manually disable all hosts, verify a new update re-enables them. # Manually disable all hosts, verify a new update re-enables them.
# Also change the host name, and verify it is not deleted, but instead # Also change the host name, and verify it is not deleted, but instead
# updated because the instance ID matches. # updated because the instance ID matches.
enabled_host_pks = set(self.inventory.hosts.filter(enabled=True).values_list('pk', flat=True))
for host in self.inventory.hosts.all(): for host in self.inventory.hosts.all():
host.enabled = False host.enabled = False
host.name = 'changed-%s' % host.name host.name = 'changed-%s' % host.name
host.save() host.save()
old_host_pks = set(self.inventory.hosts.values_list('pk', flat=True)) old_host_pks = set(self.inventory.hosts.values_list('pk', flat=True))
self.check_inventory_source(inventory_source, initial=False) self.check_inventory_source(inventory_source, initial=False, enabled_host_pks=enabled_host_pks)
new_host_pks = set(self.inventory.hosts.values_list('pk', flat=True)) new_host_pks = set(self.inventory.hosts.values_list('pk', flat=True))
self.assertEqual(old_host_pks, new_host_pks) self.assertEqual(old_host_pks, new_host_pks)
# If test source regions is given, test again with empty string. # If test source regions is given, test again with empty string.