zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-16 06:58:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

AC-1278 Reduced the level of pickiness expressed by inventory_import regarding filenames.

Browse Source
This commit is contained in:
Chris Church
2014-05-15 13:08:48 -04:00
parent c7ed154149
commit 6d0da4672d
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
awx/main/tests/commands.py
+5 -3
View File
@@ -860,12 +860,14 @@ class InventoryImportTest(BaseCommandMixin, BaseLiveServerTest):
new_inv = self.organizations[0].inventories.create(name='newec2')
self.assertEqual(new_inv.hosts.count(), 0)
self.assertEqual(new_inv.groups.count(), 0)
inv_file = os.path.join(os.path.dirname(__file__), 'data',
'large_ec2_inventory.py')
#inv_file = os.path.join(os.path.dirname(__file__), 'data',
# 'large_ec2_inventory.py')
os.chdir(os.path.join(os.path.dirname(__file__), 'data'))
inv_file = 'large_ec2_inventory.py'
result, stdout, stderr = self.run_command('inventory_import',
inventory_id=new_inv.pk,
source=inv_file)
self.assertEqual(result, None)
self.assertEqual(result, None, stdout+stderr)
# Check that inventory is populated as expected within a reasonable
# amount of time. Computed fields should also be updated.
new_inv = Inventory.objects.get(pk=new_inv.pk)