mirror of
https://github.com/ZwareBear/awx.git
synced 2026-04-30 20:01:48 -05:00
Limit max depth when building mapping of group depths to avoid hitting recursion limit. Fixes https://trello.com/c/2zc0odvX
This commit is contained in:
committed by
Matthew Jones
parent
1982177248
commit
001127f8bd
@@ -99,6 +99,19 @@ lb[01:09:2].example.us even_odd=odd
|
||||
media[0:9][0:9].example.cc
|
||||
'''
|
||||
|
||||
TEST_INVENTORY_INI_WITH_RECURSIVE_GROUPS = '''\
|
||||
[family:children]
|
||||
parent
|
||||
|
||||
[parent:children]
|
||||
child
|
||||
|
||||
[child:children]
|
||||
grandchild
|
||||
|
||||
[grandchild:children]
|
||||
parent
|
||||
'''
|
||||
|
||||
class BaseCommandMixin(object):
|
||||
'''
|
||||
@@ -974,6 +987,16 @@ class InventoryImportTest(BaseCommandMixin, BaseLiveServerTest):
|
||||
source=self.ini_path)
|
||||
self.assertTrue(isinstance(result, ValueError), result)
|
||||
|
||||
def test_ini_file_with_recursive_groups(self):
|
||||
self.create_test_ini(ini_content=TEST_INVENTORY_INI_WITH_RECURSIVE_GROUPS)
|
||||
new_inv = self.organizations[0].inventories.create(name='new')
|
||||
self.assertEqual(new_inv.hosts.count(), 0)
|
||||
self.assertEqual(new_inv.groups.count(), 0)
|
||||
result, stdout, stderr = self.run_command('inventory_import',
|
||||
inventory_id=new_inv.pk,
|
||||
source=self.ini_path)
|
||||
self.assertEqual(result, None, stdout + stderr)
|
||||
|
||||
def test_executable_file(self):
|
||||
# Use existing inventory as source.
|
||||
old_inv = self.inventories[1]
|
||||
|
||||
Reference in New Issue
Block a user