From 0061c57577d64a047e60a3ed41e5abe8656d460d Mon Sep 17 00:00:00 2001 From: Alan Rominger Date: Fri, 18 Sep 2020 16:35:37 -0400 Subject: [PATCH] update inventory injector tests --- .../tests/functional/test_inventory_source_injectors.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/awx/main/tests/functional/test_inventory_source_injectors.py b/awx/main/tests/functional/test_inventory_source_injectors.py index 5fd12a332d..6e75bf2078 100644 --- a/awx/main/tests/functional/test_inventory_source_injectors.py +++ b/awx/main/tests/functional/test_inventory_source_injectors.py @@ -99,7 +99,13 @@ def read_content(private_data_dir, raw_env, inventory_update): dir_contents = {} referenced_paths = set() file_aliases = {} - filename_list = sorted(os.listdir(private_data_dir), key=lambda fn: inverse_env.get(os.path.join(private_data_dir, fn), [fn])[0]) + filename_list = os.listdir(private_data_dir) + for subdir in ('env', 'inventory'): + if subdir in filename_list: + filename_list.remove(subdir) + for filename in os.listdir(os.path.join(private_data_dir, subdir)): + filename_list.append(os.path.join(subdir, filename)) + filename_list = sorted(filename_list, key=lambda fn: inverse_env.get(os.path.join(private_data_dir, fn), [fn])[0]) for filename in filename_list: if filename in ('args', 'project'): continue # Ansible runner