diff options
| author | Matt Clay <matt@mystile.com> | 2023-02-10 14:57:01 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-10 14:57:01 -0800 |
| commit | c34d8f4be57101d20d460d7a979600e37c420ef1 (patch) | |
| tree | f780e934da5d70e1ef8213d4bbe7ff7c6fa158b9 | |
| parent | c6984944d11c45ee2cf19873cab97c9a01bc67c6 (diff) | |
| download | ansible-c34d8f4be57101d20d460d7a979600e37c420ef1.tar.gz | |
[stable-2.12] ansible-test - Specify config path in plugin error (#79881) (#79979)
(cherry picked from commit d48d1c23df171074e799717e824a8c5ace470643)
| -rw-r--r-- | changelogs/fragments/ansible-test-test-plugin-error-message.yml | 3 | ||||
| -rw-r--r-- | test/lib/ansible_test/_internal/commands/integration/cloud/__init__.py | 8 |
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 5afde048b3..3ca8171947 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): # type: () -> None """Setup the cloud resource before delegation and register a cleanup callback.""" |