summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Clay <matt@mystile.com>2023-02-10 14:56:46 -0800
committerGitHub <noreply@github.com>2023-02-10 14:56:46 -0800
commit4fe7aae21da993ed737d71c162e10f9bce124c65 (patch)
tree87b166913956549f55752a3266bd60b8e7948e1c
parent7027806a770ed51e97193743101925995fa7abaf (diff)
downloadansible-4fe7aae21da993ed737d71c162e10f9bce124c65.tar.gz
[stable-2.14] ansible-test - Specify config path in plugin error (#79881) (#79977)
(cherry picked from commit d48d1c23df171074e799717e824a8c5ace470643)
-rw-r--r--changelogs/fragments/ansible-test-test-plugin-error-message.yml3
-rw-r--r--test/lib/ansible_test/_internal/commands/integration/cloud/__init__.py8
2 files changed, 7 insertions, 4 deletions
diff --git a/changelogs/fragments/ansible-test-test-plugin-error-message.yml b/changelogs/fragments/ansible-test-test-plugin-error-message.yml
new file mode 100644
index 0000000000..f510425a13
--- /dev/null
+++ b/changelogs/fragments/ansible-test-test-plugin-error-message.yml
@@ -0,0 +1,3 @@
+minor_changes:
+ - "ansible-test - Specify the configuration file location required by test plugins when the config file is not found.
+ This resolves issue: https://github.com/ansible/ansible/issues/79411"
diff --git a/test/lib/ansible_test/_internal/commands/integration/cloud/__init__.py b/test/lib/ansible_test/_internal/commands/integration/cloud/__init__.py
index 32d90d6fe5..0c078b98f5 100644
--- a/test/lib/ansible_test/_internal/commands/integration/cloud/__init__.py
+++ b/test/lib/ansible_test/_internal/commands/integration/cloud/__init__.py
@@ -288,14 +288,14 @@ class CloudProvider(CloudBase):
exclude.append(skip)
if not self.uses_docker and self.uses_config:
- display.warning('Excluding tests marked "%s" which require config (see "%s"): %s'
- % (skip.rstrip('/'), self.config_template_path, ', '.join(skipped)))
+ display.warning('Excluding tests marked "%s" which require a "%s" config file (see "%s"): %s'
+ % (skip.rstrip('/'), self.config_static_path, self.config_template_path, ', '.join(skipped)))
elif self.uses_docker and not self.uses_config:
display.warning('Excluding tests marked "%s" which requires container support: %s'
% (skip.rstrip('/'), ', '.join(skipped)))
elif self.uses_docker and self.uses_config:
- display.warning('Excluding tests marked "%s" which requires container support or config (see "%s"): %s'
- % (skip.rstrip('/'), self.config_template_path, ', '.join(skipped)))
+ display.warning('Excluding tests marked "%s" which requires container support or a "%s" config file (see "%s"): %s'
+ % (skip.rstrip('/'), self.config_static_path, self.config_template_path, ', '.join(skipped)))
def setup(self) -> None:
"""Setup the cloud resource before delegation and register a cleanup callback."""