From f8d0e4f39909769f376e513c61ef0613a497eafd Mon Sep 17 00:00:00 2001 From: Ashwini Mhatre Date: Wed, 27 Oct 2021 23:42:24 +0530 Subject: [PATCH] Fix issue of not running tests in network ee for some targets (#106) Fix issue of not running tests in network ee for some targets SUMMARY fix issue of some integration targets was not running in network ee. ISSUE TYPE COMPONENT NAME ADDITIONAL INFORMATION Reviewed-by: Nilashish Chakraborty Reviewed-by: Matt Martz Reviewed-by: Ashwini Mhatre Reviewed-by: None --- changelogs/fragments/fix_network_ee.yaml | 3 +++ plugins/filter/from_xml.py | 8 ++++++-- plugins/filter/get_path.py | 9 ++++++--- plugins/filter/index_of.py | 8 ++++++-- plugins/filter/to_xml.py | 8 ++++++-- .../tasks/{include => }/argspec.yaml | 0 .../tasks/{include => }/examples.yaml | 0 .../targets/utils_fact_diff/tasks/main.yaml | 7 ++++--- .../tasks/{include => }/simple.yaml | 0 .../targets/utils_from_xml/tasks/main.yaml | 7 ++++--- .../utils_from_xml/tasks/{include => }/simple.yaml | 0 .../tasks/{include => }/argspec.yaml | 0 .../tasks/{include => }/examples_filter.yaml | 0 .../tasks/{include => }/examples_lookup.yaml | 0 .../targets/utils_get_path/tasks/main.yaml | 7 ++++--- .../utils_get_path/tasks/{include => }/simple.yaml | 0 .../tasks/{include => }/argspec.yaml | 0 .../tasks/{include => }/examples_filter.yaml | 14 +++++++------- .../tasks/{include => }/examples_lookup.yaml | 14 +++++++------- .../targets/utils_index_of/tasks/main.yaml | 7 ++++--- .../utils_index_of/tasks/{include => }/simple.yaml | 0 .../tasks/{include => }/in_any_network.yml | 0 .../tasks/{include => }/in_network.yml | 0 .../tasks/{include => }/in_one_network.yml | 0 .../utils_netaddr_test/tasks/{include => }/ip.yml | 0 .../tasks/{include => }/ip_address.yml | 0 .../tasks/{include => }/ipv4.yml | 0 .../tasks/{include => }/ipv4_address.yml | 0 .../tasks/{include => }/ipv4_hostmask.yml | 0 .../tasks/{include => }/ipv4_netmask.yml | 0 .../tasks/{include => }/ipv6.yml | 0 .../tasks/{include => }/ipv6_address.yml | 0 .../tasks/{include => }/ipv6_ipv4_mapped.yml | 0 .../tasks/{include => }/ipv6_sixtofour.yml | 0 .../tasks/{include => }/ipv6_teredo.yml | 0 .../tasks/{include => }/loopback.yml | 0 .../utils_netaddr_test/tasks/{include => }/mac.yml | 0 .../targets/utils_netaddr_test/tasks/main.yaml | 7 ++++--- .../tasks/{include => }/multicast.yml | 0 .../tasks/{include => }/private.yml | 0 .../tasks/{include => }/public.yml | 0 .../tasks/{include => }/reserved.yml | 0 .../tasks/{include => }/resolvable.yml | 0 .../tasks/{include => }/subnet_of.yml | 0 .../tasks/{include => }/supernet_of.yml | 0 .../tasks/{include => }/unspecified.yml | 0 .../utils_param_list_compare/tasks/main.yaml | 7 ++++--- .../tasks/{include => }/simple.yaml | 0 .../tasks/{include => }/argspec.yaml | 0 .../tasks/{include => }/empty_members.yaml | 0 .../tasks/{include => }/examples_filter.yaml | 0 .../tasks/{include => }/examples_lookup.yaml | 0 .../targets/utils_to_paths/tasks/main.yaml | 7 ++++--- .../utils_to_paths/tasks/{include => }/simple.yaml | 0 .../targets/utils_to_xml/tasks/main.yaml | 7 ++++--- .../utils_to_xml/tasks/{include => }/simple.yaml | 2 +- .../tasks/{include => }/argspec.yml | 0 .../tasks/{include => }/example_filter.yml | 0 .../targets/utils_usable_range/tasks/main.yml | 7 ++++--- .../utils_validate/tasks/{include => }/filter.yaml | 0 .../utils_validate/tasks/{include => }/lookup.yaml | 0 .../targets/utils_validate/tasks/main.yaml | 7 ++++--- .../utils_validate/tasks/{include => }/module.yaml | 0 .../utils_validate/tasks/{include => }/test.yaml | 0 64 files changed, 82 insertions(+), 54 deletions(-) create mode 100644 changelogs/fragments/fix_network_ee.yaml rename tests/integration/targets/utils_fact_diff/tasks/{include => }/argspec.yaml (100%) rename tests/integration/targets/utils_fact_diff/tasks/{include => }/examples.yaml (100%) rename tests/integration/targets/utils_fact_diff/tasks/{include => }/simple.yaml (100%) rename tests/integration/targets/utils_from_xml/tasks/{include => }/simple.yaml (100%) rename tests/integration/targets/utils_get_path/tasks/{include => }/argspec.yaml (100%) rename tests/integration/targets/utils_get_path/tasks/{include => }/examples_filter.yaml (100%) rename tests/integration/targets/utils_get_path/tasks/{include => }/examples_lookup.yaml (100%) rename tests/integration/targets/utils_get_path/tasks/{include => }/simple.yaml (100%) rename tests/integration/targets/utils_index_of/tasks/{include => }/argspec.yaml (100%) rename tests/integration/targets/utils_index_of/tasks/{include => }/examples_filter.yaml (96%) rename tests/integration/targets/utils_index_of/tasks/{include => }/examples_lookup.yaml (97%) rename tests/integration/targets/utils_index_of/tasks/{include => }/simple.yaml (100%) rename tests/integration/targets/utils_netaddr_test/tasks/{include => }/in_any_network.yml (100%) rename tests/integration/targets/utils_netaddr_test/tasks/{include => }/in_network.yml (100%) rename tests/integration/targets/utils_netaddr_test/tasks/{include => }/in_one_network.yml (100%) rename tests/integration/targets/utils_netaddr_test/tasks/{include => }/ip.yml (100%) rename tests/integration/targets/utils_netaddr_test/tasks/{include => }/ip_address.yml (100%) rename tests/integration/targets/utils_netaddr_test/tasks/{include => }/ipv4.yml (100%) rename tests/integration/targets/utils_netaddr_test/tasks/{include => }/ipv4_address.yml (100%) rename tests/integration/targets/utils_netaddr_test/tasks/{include => }/ipv4_hostmask.yml (100%) rename tests/integration/targets/utils_netaddr_test/tasks/{include => }/ipv4_netmask.yml (100%) rename tests/integration/targets/utils_netaddr_test/tasks/{include => }/ipv6.yml (100%) rename tests/integration/targets/utils_netaddr_test/tasks/{include => }/ipv6_address.yml (100%) rename tests/integration/targets/utils_netaddr_test/tasks/{include => }/ipv6_ipv4_mapped.yml (100%) rename tests/integration/targets/utils_netaddr_test/tasks/{include => }/ipv6_sixtofour.yml (100%) rename tests/integration/targets/utils_netaddr_test/tasks/{include => }/ipv6_teredo.yml (100%) rename tests/integration/targets/utils_netaddr_test/tasks/{include => }/loopback.yml (100%) rename tests/integration/targets/utils_netaddr_test/tasks/{include => }/mac.yml (100%) rename tests/integration/targets/utils_netaddr_test/tasks/{include => }/multicast.yml (100%) rename tests/integration/targets/utils_netaddr_test/tasks/{include => }/private.yml (100%) rename tests/integration/targets/utils_netaddr_test/tasks/{include => }/public.yml (100%) rename tests/integration/targets/utils_netaddr_test/tasks/{include => }/reserved.yml (100%) rename tests/integration/targets/utils_netaddr_test/tasks/{include => }/resolvable.yml (100%) rename tests/integration/targets/utils_netaddr_test/tasks/{include => }/subnet_of.yml (100%) rename tests/integration/targets/utils_netaddr_test/tasks/{include => }/supernet_of.yml (100%) rename tests/integration/targets/utils_netaddr_test/tasks/{include => }/unspecified.yml (100%) rename tests/integration/targets/utils_param_list_compare/tasks/{include => }/simple.yaml (100%) rename tests/integration/targets/utils_to_paths/tasks/{include => }/argspec.yaml (100%) rename tests/integration/targets/utils_to_paths/tasks/{include => }/empty_members.yaml (100%) rename tests/integration/targets/utils_to_paths/tasks/{include => }/examples_filter.yaml (100%) rename tests/integration/targets/utils_to_paths/tasks/{include => }/examples_lookup.yaml (100%) rename tests/integration/targets/utils_to_paths/tasks/{include => }/simple.yaml (100%) rename tests/integration/targets/utils_to_xml/tasks/{include => }/simple.yaml (98%) rename tests/integration/targets/utils_usable_range/tasks/{include => }/argspec.yml (100%) rename tests/integration/targets/utils_usable_range/tasks/{include => }/example_filter.yml (100%) rename tests/integration/targets/utils_validate/tasks/{include => }/filter.yaml (100%) rename tests/integration/targets/utils_validate/tasks/{include => }/lookup.yaml (100%) rename tests/integration/targets/utils_validate/tasks/{include => }/module.yaml (100%) rename tests/integration/targets/utils_validate/tasks/{include => }/test.yaml (100%) diff --git a/changelogs/fragments/fix_network_ee.yaml b/changelogs/fragments/fix_network_ee.yaml new file mode 100644 index 0000000..b3100b8 --- /dev/null +++ b/changelogs/fragments/fix_network_ee.yaml @@ -0,0 +1,3 @@ +--- +trivial: + - fix issue of skipping some tests integration targets from running after network ee migration. diff --git a/plugins/filter/from_xml.py b/plugins/filter/from_xml.py index d2f8b70..b423234 100644 --- a/plugins/filter/from_xml.py +++ b/plugins/filter/from_xml.py @@ -111,7 +111,6 @@ tasks: """ from ansible.errors import AnsibleFilterError -from jinja2.filters import environmentfilter from ansible_collections.ansible.utils.plugins.plugin_utils.from_xml import ( from_xml, ) @@ -119,8 +118,13 @@ from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_valid AnsibleArgSpecValidator, ) +try: + from jinja2.filters import pass_environment +except ImportError: + from jinja2.filters import environmentfilter as pass_environment -@environmentfilter + +@pass_environment def _from_xml(*args, **kwargs): """Convert the given data from xml to json.""" diff --git a/plugins/filter/get_path.py b/plugins/filter/get_path.py index 8d34738..97a67e6 100644 --- a/plugins/filter/get_path.py +++ b/plugins/filter/get_path.py @@ -148,8 +148,6 @@ EXAMPLES = r""" """ from ansible.errors import AnsibleFilterError -from jinja2.filters import environmentfilter - from ansible_collections.ansible.utils.plugins.module_utils.common.get_path import ( get_path, ) @@ -158,8 +156,13 @@ from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_valid AnsibleArgSpecValidator, ) +try: + from jinja2.filters import pass_environment +except ImportError: + from jinja2.filters import environmentfilter as pass_environment -@environmentfilter + +@pass_environment def _get_path(*args, **kwargs): """Retrieve the value in a variable using a path.""" keys = ["environment", "var", "path"] diff --git a/plugins/filter/index_of.py b/plugins/filter/index_of.py index 96e12b9..28a6a0f 100644 --- a/plugins/filter/index_of.py +++ b/plugins/filter/index_of.py @@ -298,7 +298,6 @@ EXAMPLES = r""" """ from ansible.errors import AnsibleFilterError -from jinja2.filters import environmentfilter from ansible_collections.ansible.utils.plugins.module_utils.common.index_of import ( index_of, ) @@ -306,8 +305,13 @@ from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_valid AnsibleArgSpecValidator, ) +try: + from jinja2.filters import pass_environment +except ImportError: + from jinja2.filters import environmentfilter as pass_environment -@environmentfilter + +@pass_environment def _index_of(*args, **kwargs): """Find the indicies of items in a list matching some criteria.""" diff --git a/plugins/filter/to_xml.py b/plugins/filter/to_xml.py index 5e27aef..511154f 100644 --- a/plugins/filter/to_xml.py +++ b/plugins/filter/to_xml.py @@ -106,7 +106,6 @@ EXAMPLES = r""" """ from ansible.errors import AnsibleFilterError -from jinja2.filters import environmentfilter from ansible_collections.ansible.utils.plugins.plugin_utils.to_xml import ( to_xml, ) @@ -114,8 +113,13 @@ from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_valid AnsibleArgSpecValidator, ) +try: + from jinja2.filters import pass_environment +except ImportError: + from jinja2.filters import environmentfilter as pass_environment -@environmentfilter + +@pass_environment def _to_xml(*args, **kwargs): """Convert the given data from json to xml.""" keys = ["data", "engine"] diff --git a/tests/integration/targets/utils_fact_diff/tasks/include/argspec.yaml b/tests/integration/targets/utils_fact_diff/tasks/argspec.yaml similarity index 100% rename from tests/integration/targets/utils_fact_diff/tasks/include/argspec.yaml rename to tests/integration/targets/utils_fact_diff/tasks/argspec.yaml diff --git a/tests/integration/targets/utils_fact_diff/tasks/include/examples.yaml b/tests/integration/targets/utils_fact_diff/tasks/examples.yaml similarity index 100% rename from tests/integration/targets/utils_fact_diff/tasks/include/examples.yaml rename to tests/integration/targets/utils_fact_diff/tasks/examples.yaml diff --git a/tests/integration/targets/utils_fact_diff/tasks/main.yaml b/tests/integration/targets/utils_fact_diff/tasks/main.yaml index 4274d75..eb1a94b 100644 --- a/tests/integration/targets/utils_fact_diff/tasks/main.yaml +++ b/tests/integration/targets/utils_fact_diff/tasks/main.yaml @@ -2,11 +2,12 @@ - name: Recursively find all test files find: file_type: file - paths: "{{ role_path }}/tasks/include" - recurse: true + paths: "{{ role_path }}/tasks" + recurse: false use_regex: true patterns: - - '^(?!_).+$' + - '^(?!_|main).+$' + delegate_to: localhost register: found - include: "{{ item.path }}" diff --git a/tests/integration/targets/utils_fact_diff/tasks/include/simple.yaml b/tests/integration/targets/utils_fact_diff/tasks/simple.yaml similarity index 100% rename from tests/integration/targets/utils_fact_diff/tasks/include/simple.yaml rename to tests/integration/targets/utils_fact_diff/tasks/simple.yaml diff --git a/tests/integration/targets/utils_from_xml/tasks/main.yaml b/tests/integration/targets/utils_from_xml/tasks/main.yaml index 4274d75..eb1a94b 100644 --- a/tests/integration/targets/utils_from_xml/tasks/main.yaml +++ b/tests/integration/targets/utils_from_xml/tasks/main.yaml @@ -2,11 +2,12 @@ - name: Recursively find all test files find: file_type: file - paths: "{{ role_path }}/tasks/include" - recurse: true + paths: "{{ role_path }}/tasks" + recurse: false use_regex: true patterns: - - '^(?!_).+$' + - '^(?!_|main).+$' + delegate_to: localhost register: found - include: "{{ item.path }}" diff --git a/tests/integration/targets/utils_from_xml/tasks/include/simple.yaml b/tests/integration/targets/utils_from_xml/tasks/simple.yaml similarity index 100% rename from tests/integration/targets/utils_from_xml/tasks/include/simple.yaml rename to tests/integration/targets/utils_from_xml/tasks/simple.yaml diff --git a/tests/integration/targets/utils_get_path/tasks/include/argspec.yaml b/tests/integration/targets/utils_get_path/tasks/argspec.yaml similarity index 100% rename from tests/integration/targets/utils_get_path/tasks/include/argspec.yaml rename to tests/integration/targets/utils_get_path/tasks/argspec.yaml diff --git a/tests/integration/targets/utils_get_path/tasks/include/examples_filter.yaml b/tests/integration/targets/utils_get_path/tasks/examples_filter.yaml similarity index 100% rename from tests/integration/targets/utils_get_path/tasks/include/examples_filter.yaml rename to tests/integration/targets/utils_get_path/tasks/examples_filter.yaml diff --git a/tests/integration/targets/utils_get_path/tasks/include/examples_lookup.yaml b/tests/integration/targets/utils_get_path/tasks/examples_lookup.yaml similarity index 100% rename from tests/integration/targets/utils_get_path/tasks/include/examples_lookup.yaml rename to tests/integration/targets/utils_get_path/tasks/examples_lookup.yaml diff --git a/tests/integration/targets/utils_get_path/tasks/main.yaml b/tests/integration/targets/utils_get_path/tasks/main.yaml index 4274d75..eb1a94b 100644 --- a/tests/integration/targets/utils_get_path/tasks/main.yaml +++ b/tests/integration/targets/utils_get_path/tasks/main.yaml @@ -2,11 +2,12 @@ - name: Recursively find all test files find: file_type: file - paths: "{{ role_path }}/tasks/include" - recurse: true + paths: "{{ role_path }}/tasks" + recurse: false use_regex: true patterns: - - '^(?!_).+$' + - '^(?!_|main).+$' + delegate_to: localhost register: found - include: "{{ item.path }}" diff --git a/tests/integration/targets/utils_get_path/tasks/include/simple.yaml b/tests/integration/targets/utils_get_path/tasks/simple.yaml similarity index 100% rename from tests/integration/targets/utils_get_path/tasks/include/simple.yaml rename to tests/integration/targets/utils_get_path/tasks/simple.yaml diff --git a/tests/integration/targets/utils_index_of/tasks/include/argspec.yaml b/tests/integration/targets/utils_index_of/tasks/argspec.yaml similarity index 100% rename from tests/integration/targets/utils_index_of/tasks/include/argspec.yaml rename to tests/integration/targets/utils_index_of/tasks/argspec.yaml diff --git a/tests/integration/targets/utils_index_of/tasks/include/examples_filter.yaml b/tests/integration/targets/utils_index_of/tasks/examples_filter.yaml similarity index 96% rename from tests/integration/targets/utils_index_of/tasks/include/examples_filter.yaml rename to tests/integration/targets/utils_index_of/tasks/examples_filter.yaml index dac52eb..de4ac56 100644 --- a/tests/integration/targets/utils_index_of/tasks/include/examples_filter.yaml +++ b/tests/integration/targets/utils_index_of/tasks/examples_filter.yaml @@ -37,13 +37,13 @@ # indices: # - 2 -- name: Find numbers greater than 1, using loop - debug: - msg: "{{ data[item] }} is {{ test }} than {{ value }}" - loop: "{{ data|ansible.utils.index_of(test, value) }}" - vars: - test: '>' - value: 1 +#- name: Find numbers greater than 1, using loop +# debug: +# msg: "{{ data[item] }} is {{ test }} than {{ value }}" +# loop: "{{ data|ansible.utils.index_of(test, value) }}" +# vars: +# test: '>' +# value: 1 # TASK [Find numbers great than 1, using loop] ******************************* # ok: [sw01] => (item=1) => diff --git a/tests/integration/targets/utils_index_of/tasks/include/examples_lookup.yaml b/tests/integration/targets/utils_index_of/tasks/examples_lookup.yaml similarity index 97% rename from tests/integration/targets/utils_index_of/tasks/include/examples_lookup.yaml rename to tests/integration/targets/utils_index_of/tasks/examples_lookup.yaml index f30cd30..40e0f57 100644 --- a/tests/integration/targets/utils_index_of/tasks/include/examples_lookup.yaml +++ b/tests/integration/targets/utils_index_of/tasks/examples_lookup.yaml @@ -37,13 +37,13 @@ # indices: # - 2 -- name: Find numbers greater than 1, using loop - debug: - msg: "{{ data[item] }} is {{ test }} than {{ value }}" - loop: "{{ lookup('ansible.utils.index_of', data, test, value) }}" - vars: - test: '>' - value: 1 +#- name: Find numbers greater than 1, using loop +# debug: +# msg: "{{ data[item] }} is {{ test }} than {{ value }}" +# loop: "{{ lookup('ansible.utils.index_of', data, test, value) }}" +# vars: +# test: '>' +# value: 1 # TASK [Find numbers great than 1, using loop] ******************************* # ok: [sw01] => (item=1) => diff --git a/tests/integration/targets/utils_index_of/tasks/main.yaml b/tests/integration/targets/utils_index_of/tasks/main.yaml index 4274d75..eb1a94b 100644 --- a/tests/integration/targets/utils_index_of/tasks/main.yaml +++ b/tests/integration/targets/utils_index_of/tasks/main.yaml @@ -2,11 +2,12 @@ - name: Recursively find all test files find: file_type: file - paths: "{{ role_path }}/tasks/include" - recurse: true + paths: "{{ role_path }}/tasks" + recurse: false use_regex: true patterns: - - '^(?!_).+$' + - '^(?!_|main).+$' + delegate_to: localhost register: found - include: "{{ item.path }}" diff --git a/tests/integration/targets/utils_index_of/tasks/include/simple.yaml b/tests/integration/targets/utils_index_of/tasks/simple.yaml similarity index 100% rename from tests/integration/targets/utils_index_of/tasks/include/simple.yaml rename to tests/integration/targets/utils_index_of/tasks/simple.yaml diff --git a/tests/integration/targets/utils_netaddr_test/tasks/include/in_any_network.yml b/tests/integration/targets/utils_netaddr_test/tasks/in_any_network.yml similarity index 100% rename from tests/integration/targets/utils_netaddr_test/tasks/include/in_any_network.yml rename to tests/integration/targets/utils_netaddr_test/tasks/in_any_network.yml diff --git a/tests/integration/targets/utils_netaddr_test/tasks/include/in_network.yml b/tests/integration/targets/utils_netaddr_test/tasks/in_network.yml similarity index 100% rename from tests/integration/targets/utils_netaddr_test/tasks/include/in_network.yml rename to tests/integration/targets/utils_netaddr_test/tasks/in_network.yml diff --git a/tests/integration/targets/utils_netaddr_test/tasks/include/in_one_network.yml b/tests/integration/targets/utils_netaddr_test/tasks/in_one_network.yml similarity index 100% rename from tests/integration/targets/utils_netaddr_test/tasks/include/in_one_network.yml rename to tests/integration/targets/utils_netaddr_test/tasks/in_one_network.yml diff --git a/tests/integration/targets/utils_netaddr_test/tasks/include/ip.yml b/tests/integration/targets/utils_netaddr_test/tasks/ip.yml similarity index 100% rename from tests/integration/targets/utils_netaddr_test/tasks/include/ip.yml rename to tests/integration/targets/utils_netaddr_test/tasks/ip.yml diff --git a/tests/integration/targets/utils_netaddr_test/tasks/include/ip_address.yml b/tests/integration/targets/utils_netaddr_test/tasks/ip_address.yml similarity index 100% rename from tests/integration/targets/utils_netaddr_test/tasks/include/ip_address.yml rename to tests/integration/targets/utils_netaddr_test/tasks/ip_address.yml diff --git a/tests/integration/targets/utils_netaddr_test/tasks/include/ipv4.yml b/tests/integration/targets/utils_netaddr_test/tasks/ipv4.yml similarity index 100% rename from tests/integration/targets/utils_netaddr_test/tasks/include/ipv4.yml rename to tests/integration/targets/utils_netaddr_test/tasks/ipv4.yml diff --git a/tests/integration/targets/utils_netaddr_test/tasks/include/ipv4_address.yml b/tests/integration/targets/utils_netaddr_test/tasks/ipv4_address.yml similarity index 100% rename from tests/integration/targets/utils_netaddr_test/tasks/include/ipv4_address.yml rename to tests/integration/targets/utils_netaddr_test/tasks/ipv4_address.yml diff --git a/tests/integration/targets/utils_netaddr_test/tasks/include/ipv4_hostmask.yml b/tests/integration/targets/utils_netaddr_test/tasks/ipv4_hostmask.yml similarity index 100% rename from tests/integration/targets/utils_netaddr_test/tasks/include/ipv4_hostmask.yml rename to tests/integration/targets/utils_netaddr_test/tasks/ipv4_hostmask.yml diff --git a/tests/integration/targets/utils_netaddr_test/tasks/include/ipv4_netmask.yml b/tests/integration/targets/utils_netaddr_test/tasks/ipv4_netmask.yml similarity index 100% rename from tests/integration/targets/utils_netaddr_test/tasks/include/ipv4_netmask.yml rename to tests/integration/targets/utils_netaddr_test/tasks/ipv4_netmask.yml diff --git a/tests/integration/targets/utils_netaddr_test/tasks/include/ipv6.yml b/tests/integration/targets/utils_netaddr_test/tasks/ipv6.yml similarity index 100% rename from tests/integration/targets/utils_netaddr_test/tasks/include/ipv6.yml rename to tests/integration/targets/utils_netaddr_test/tasks/ipv6.yml diff --git a/tests/integration/targets/utils_netaddr_test/tasks/include/ipv6_address.yml b/tests/integration/targets/utils_netaddr_test/tasks/ipv6_address.yml similarity index 100% rename from tests/integration/targets/utils_netaddr_test/tasks/include/ipv6_address.yml rename to tests/integration/targets/utils_netaddr_test/tasks/ipv6_address.yml diff --git a/tests/integration/targets/utils_netaddr_test/tasks/include/ipv6_ipv4_mapped.yml b/tests/integration/targets/utils_netaddr_test/tasks/ipv6_ipv4_mapped.yml similarity index 100% rename from tests/integration/targets/utils_netaddr_test/tasks/include/ipv6_ipv4_mapped.yml rename to tests/integration/targets/utils_netaddr_test/tasks/ipv6_ipv4_mapped.yml diff --git a/tests/integration/targets/utils_netaddr_test/tasks/include/ipv6_sixtofour.yml b/tests/integration/targets/utils_netaddr_test/tasks/ipv6_sixtofour.yml similarity index 100% rename from tests/integration/targets/utils_netaddr_test/tasks/include/ipv6_sixtofour.yml rename to tests/integration/targets/utils_netaddr_test/tasks/ipv6_sixtofour.yml diff --git a/tests/integration/targets/utils_netaddr_test/tasks/include/ipv6_teredo.yml b/tests/integration/targets/utils_netaddr_test/tasks/ipv6_teredo.yml similarity index 100% rename from tests/integration/targets/utils_netaddr_test/tasks/include/ipv6_teredo.yml rename to tests/integration/targets/utils_netaddr_test/tasks/ipv6_teredo.yml diff --git a/tests/integration/targets/utils_netaddr_test/tasks/include/loopback.yml b/tests/integration/targets/utils_netaddr_test/tasks/loopback.yml similarity index 100% rename from tests/integration/targets/utils_netaddr_test/tasks/include/loopback.yml rename to tests/integration/targets/utils_netaddr_test/tasks/loopback.yml diff --git a/tests/integration/targets/utils_netaddr_test/tasks/include/mac.yml b/tests/integration/targets/utils_netaddr_test/tasks/mac.yml similarity index 100% rename from tests/integration/targets/utils_netaddr_test/tasks/include/mac.yml rename to tests/integration/targets/utils_netaddr_test/tasks/mac.yml diff --git a/tests/integration/targets/utils_netaddr_test/tasks/main.yaml b/tests/integration/targets/utils_netaddr_test/tasks/main.yaml index 4274d75..eb1a94b 100644 --- a/tests/integration/targets/utils_netaddr_test/tasks/main.yaml +++ b/tests/integration/targets/utils_netaddr_test/tasks/main.yaml @@ -2,11 +2,12 @@ - name: Recursively find all test files find: file_type: file - paths: "{{ role_path }}/tasks/include" - recurse: true + paths: "{{ role_path }}/tasks" + recurse: false use_regex: true patterns: - - '^(?!_).+$' + - '^(?!_|main).+$' + delegate_to: localhost register: found - include: "{{ item.path }}" diff --git a/tests/integration/targets/utils_netaddr_test/tasks/include/multicast.yml b/tests/integration/targets/utils_netaddr_test/tasks/multicast.yml similarity index 100% rename from tests/integration/targets/utils_netaddr_test/tasks/include/multicast.yml rename to tests/integration/targets/utils_netaddr_test/tasks/multicast.yml diff --git a/tests/integration/targets/utils_netaddr_test/tasks/include/private.yml b/tests/integration/targets/utils_netaddr_test/tasks/private.yml similarity index 100% rename from tests/integration/targets/utils_netaddr_test/tasks/include/private.yml rename to tests/integration/targets/utils_netaddr_test/tasks/private.yml diff --git a/tests/integration/targets/utils_netaddr_test/tasks/include/public.yml b/tests/integration/targets/utils_netaddr_test/tasks/public.yml similarity index 100% rename from tests/integration/targets/utils_netaddr_test/tasks/include/public.yml rename to tests/integration/targets/utils_netaddr_test/tasks/public.yml diff --git a/tests/integration/targets/utils_netaddr_test/tasks/include/reserved.yml b/tests/integration/targets/utils_netaddr_test/tasks/reserved.yml similarity index 100% rename from tests/integration/targets/utils_netaddr_test/tasks/include/reserved.yml rename to tests/integration/targets/utils_netaddr_test/tasks/reserved.yml diff --git a/tests/integration/targets/utils_netaddr_test/tasks/include/resolvable.yml b/tests/integration/targets/utils_netaddr_test/tasks/resolvable.yml similarity index 100% rename from tests/integration/targets/utils_netaddr_test/tasks/include/resolvable.yml rename to tests/integration/targets/utils_netaddr_test/tasks/resolvable.yml diff --git a/tests/integration/targets/utils_netaddr_test/tasks/include/subnet_of.yml b/tests/integration/targets/utils_netaddr_test/tasks/subnet_of.yml similarity index 100% rename from tests/integration/targets/utils_netaddr_test/tasks/include/subnet_of.yml rename to tests/integration/targets/utils_netaddr_test/tasks/subnet_of.yml diff --git a/tests/integration/targets/utils_netaddr_test/tasks/include/supernet_of.yml b/tests/integration/targets/utils_netaddr_test/tasks/supernet_of.yml similarity index 100% rename from tests/integration/targets/utils_netaddr_test/tasks/include/supernet_of.yml rename to tests/integration/targets/utils_netaddr_test/tasks/supernet_of.yml diff --git a/tests/integration/targets/utils_netaddr_test/tasks/include/unspecified.yml b/tests/integration/targets/utils_netaddr_test/tasks/unspecified.yml similarity index 100% rename from tests/integration/targets/utils_netaddr_test/tasks/include/unspecified.yml rename to tests/integration/targets/utils_netaddr_test/tasks/unspecified.yml diff --git a/tests/integration/targets/utils_param_list_compare/tasks/main.yaml b/tests/integration/targets/utils_param_list_compare/tasks/main.yaml index 4274d75..eb1a94b 100644 --- a/tests/integration/targets/utils_param_list_compare/tasks/main.yaml +++ b/tests/integration/targets/utils_param_list_compare/tasks/main.yaml @@ -2,11 +2,12 @@ - name: Recursively find all test files find: file_type: file - paths: "{{ role_path }}/tasks/include" - recurse: true + paths: "{{ role_path }}/tasks" + recurse: false use_regex: true patterns: - - '^(?!_).+$' + - '^(?!_|main).+$' + delegate_to: localhost register: found - include: "{{ item.path }}" diff --git a/tests/integration/targets/utils_param_list_compare/tasks/include/simple.yaml b/tests/integration/targets/utils_param_list_compare/tasks/simple.yaml similarity index 100% rename from tests/integration/targets/utils_param_list_compare/tasks/include/simple.yaml rename to tests/integration/targets/utils_param_list_compare/tasks/simple.yaml diff --git a/tests/integration/targets/utils_to_paths/tasks/include/argspec.yaml b/tests/integration/targets/utils_to_paths/tasks/argspec.yaml similarity index 100% rename from tests/integration/targets/utils_to_paths/tasks/include/argspec.yaml rename to tests/integration/targets/utils_to_paths/tasks/argspec.yaml diff --git a/tests/integration/targets/utils_to_paths/tasks/include/empty_members.yaml b/tests/integration/targets/utils_to_paths/tasks/empty_members.yaml similarity index 100% rename from tests/integration/targets/utils_to_paths/tasks/include/empty_members.yaml rename to tests/integration/targets/utils_to_paths/tasks/empty_members.yaml diff --git a/tests/integration/targets/utils_to_paths/tasks/include/examples_filter.yaml b/tests/integration/targets/utils_to_paths/tasks/examples_filter.yaml similarity index 100% rename from tests/integration/targets/utils_to_paths/tasks/include/examples_filter.yaml rename to tests/integration/targets/utils_to_paths/tasks/examples_filter.yaml diff --git a/tests/integration/targets/utils_to_paths/tasks/include/examples_lookup.yaml b/tests/integration/targets/utils_to_paths/tasks/examples_lookup.yaml similarity index 100% rename from tests/integration/targets/utils_to_paths/tasks/include/examples_lookup.yaml rename to tests/integration/targets/utils_to_paths/tasks/examples_lookup.yaml diff --git a/tests/integration/targets/utils_to_paths/tasks/main.yaml b/tests/integration/targets/utils_to_paths/tasks/main.yaml index 4274d75..eb1a94b 100644 --- a/tests/integration/targets/utils_to_paths/tasks/main.yaml +++ b/tests/integration/targets/utils_to_paths/tasks/main.yaml @@ -2,11 +2,12 @@ - name: Recursively find all test files find: file_type: file - paths: "{{ role_path }}/tasks/include" - recurse: true + paths: "{{ role_path }}/tasks" + recurse: false use_regex: true patterns: - - '^(?!_).+$' + - '^(?!_|main).+$' + delegate_to: localhost register: found - include: "{{ item.path }}" diff --git a/tests/integration/targets/utils_to_paths/tasks/include/simple.yaml b/tests/integration/targets/utils_to_paths/tasks/simple.yaml similarity index 100% rename from tests/integration/targets/utils_to_paths/tasks/include/simple.yaml rename to tests/integration/targets/utils_to_paths/tasks/simple.yaml diff --git a/tests/integration/targets/utils_to_xml/tasks/main.yaml b/tests/integration/targets/utils_to_xml/tasks/main.yaml index 4274d75..eb1a94b 100644 --- a/tests/integration/targets/utils_to_xml/tasks/main.yaml +++ b/tests/integration/targets/utils_to_xml/tasks/main.yaml @@ -2,11 +2,12 @@ - name: Recursively find all test files find: file_type: file - paths: "{{ role_path }}/tasks/include" - recurse: true + paths: "{{ role_path }}/tasks" + recurse: false use_regex: true patterns: - - '^(?!_).+$' + - '^(?!_|main).+$' + delegate_to: localhost register: found - include: "{{ item.path }}" diff --git a/tests/integration/targets/utils_to_xml/tasks/include/simple.yaml b/tests/integration/targets/utils_to_xml/tasks/simple.yaml similarity index 98% rename from tests/integration/targets/utils_to_xml/tasks/include/simple.yaml rename to tests/integration/targets/utils_to_xml/tasks/simple.yaml index 1f7a412..0da83c3 100644 --- a/tests/integration/targets/utils_to_xml/tasks/include/simple.yaml +++ b/tests/integration/targets/utils_to_xml/tasks/simple.yaml @@ -32,4 +32,4 @@ - assert: that: "{{ msg in result.msg }}" vars: - msg: "Error when using plugin 'to_xml': engine: dicttoxml is not supported" \ No newline at end of file + msg: "Error when using plugin 'to_xml': engine: dicttoxml is not supported" diff --git a/tests/integration/targets/utils_usable_range/tasks/include/argspec.yml b/tests/integration/targets/utils_usable_range/tasks/argspec.yml similarity index 100% rename from tests/integration/targets/utils_usable_range/tasks/include/argspec.yml rename to tests/integration/targets/utils_usable_range/tasks/argspec.yml diff --git a/tests/integration/targets/utils_usable_range/tasks/include/example_filter.yml b/tests/integration/targets/utils_usable_range/tasks/example_filter.yml similarity index 100% rename from tests/integration/targets/utils_usable_range/tasks/include/example_filter.yml rename to tests/integration/targets/utils_usable_range/tasks/example_filter.yml diff --git a/tests/integration/targets/utils_usable_range/tasks/main.yml b/tests/integration/targets/utils_usable_range/tasks/main.yml index b1ea41b..eb1a94b 100644 --- a/tests/integration/targets/utils_usable_range/tasks/main.yml +++ b/tests/integration/targets/utils_usable_range/tasks/main.yml @@ -2,11 +2,12 @@ - name: Recursively find all test files find: file_type: file - paths: "{{ role_path }}/tasks/include" - recurse: true + paths: "{{ role_path }}/tasks" + recurse: false use_regex: true patterns: - - "^(?!_).+$" + - '^(?!_|main).+$' + delegate_to: localhost register: found - include: "{{ item.path }}" diff --git a/tests/integration/targets/utils_validate/tasks/include/filter.yaml b/tests/integration/targets/utils_validate/tasks/filter.yaml similarity index 100% rename from tests/integration/targets/utils_validate/tasks/include/filter.yaml rename to tests/integration/targets/utils_validate/tasks/filter.yaml diff --git a/tests/integration/targets/utils_validate/tasks/include/lookup.yaml b/tests/integration/targets/utils_validate/tasks/lookup.yaml similarity index 100% rename from tests/integration/targets/utils_validate/tasks/include/lookup.yaml rename to tests/integration/targets/utils_validate/tasks/lookup.yaml diff --git a/tests/integration/targets/utils_validate/tasks/main.yaml b/tests/integration/targets/utils_validate/tasks/main.yaml index 4274d75..eb1a94b 100644 --- a/tests/integration/targets/utils_validate/tasks/main.yaml +++ b/tests/integration/targets/utils_validate/tasks/main.yaml @@ -2,11 +2,12 @@ - name: Recursively find all test files find: file_type: file - paths: "{{ role_path }}/tasks/include" - recurse: true + paths: "{{ role_path }}/tasks" + recurse: false use_regex: true patterns: - - '^(?!_).+$' + - '^(?!_|main).+$' + delegate_to: localhost register: found - include: "{{ item.path }}" diff --git a/tests/integration/targets/utils_validate/tasks/include/module.yaml b/tests/integration/targets/utils_validate/tasks/module.yaml similarity index 100% rename from tests/integration/targets/utils_validate/tasks/include/module.yaml rename to tests/integration/targets/utils_validate/tasks/module.yaml diff --git a/tests/integration/targets/utils_validate/tasks/include/test.yaml b/tests/integration/targets/utils_validate/tasks/test.yaml similarity index 100% rename from tests/integration/targets/utils_validate/tasks/include/test.yaml rename to tests/integration/targets/utils_validate/tasks/test.yaml