Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ansible-test: make sure tests are also run for the new plugin types #73599

Merged
merged 2 commits into from Feb 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/73599-ansible-test-new-plugin-dirs.yml
@@ -0,0 +1,2 @@
minor_changes:
- "ansible-test - add the collection plugin directories ``plugin_utils`` and ``sub_plugins`` to list of plugin types. This ensures such plugins are tested for the ``import`` sanity test (https://github.com/ansible/ansible/pull/73599)."
4 changes: 4 additions & 0 deletions test/lib/ansible_test/_internal/provider/layout/__init__.py
Expand Up @@ -193,6 +193,10 @@ class LayoutProvider(PathProvider):
'terminal',
'test',
'vars',
# The following are plugin directories not directly supported by ansible-core, but used in collections
# (https://github.com/ansible-collections/overview/blob/main/collection_requirements.rst#modules--plugins)
'plugin_utils',
'sub_plugins',
)

@abc.abstractmethod
Expand Down
4 changes: 4 additions & 0 deletions test/lib/ansible_test/_internal/sanity/ansible_doc.py
Expand Up @@ -58,6 +58,10 @@ def filter_targets(self, targets): # type: (t.List[TestTarget]) -> t.List[TestT
'module_utils',
'terminal',
'test',
# The following are plugin directories not directly supported by ansible-core (and thus also not by ansible-doc)
# (https://github.com/ansible-collections/overview/blob/main/collection_requirements.rst#modules--plugins)
'plugin_utils',
'sub_plugins',
])

plugin_paths = [plugin_path for plugin_type, plugin_path in data_context().content.plugin_paths.items() if plugin_type not in unsupported_plugin_types]
Expand Down