From 4fe7aae21da993ed737d71c162e10f9bce124c65 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Fri, 10 Feb 2023 14:56:46 -0800 Subject: [PATCH] [stable-2.14] ansible-test - Specify config path in plugin error (#79881) (#79977) (cherry picked from commit d48d1c23df171074e799717e824a8c5ace470643) --- .../fragments/ansible-test-test-plugin-error-message.yml | 3 +++ .../_internal/commands/integration/cloud/__init__.py | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 changelogs/fragments/ansible-test-test-plugin-error-message.yml 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 00000000000..f510425a13d --- /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 32d90d6fe51..0c078b98f5d 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."""