From 8367af9cdd734f67c7a8f997213cb4f84095b85a Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Wed, 10 Aug 2022 18:53:19 -0700 Subject: [PATCH] ansible-test - No locale warning with delegation. (#78505) The locale warning for the origin host is not relevant when delegation is used. It is also not relevant when non-test commands are in use. --- test/lib/ansible_test/_internal/__init__.py | 6 +++++- test/lib/ansible_test/_internal/util.py | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/test/lib/ansible_test/_internal/__init__.py b/test/lib/ansible_test/_internal/__init__.py index 3b779604cc1..3ed74ef6992 100644 --- a/test/lib/ansible_test/_internal/__init__.py +++ b/test/lib/ansible_test/_internal/__init__.py @@ -47,6 +47,10 @@ from .provisioning import ( PrimeContainers, ) +from .config import ( + TestConfig, +) + def main(cli_args: t.Optional[list[str]] = None) -> None: """Main program function.""" @@ -60,7 +64,7 @@ def main(cli_args: t.Optional[list[str]] = None) -> None: display.color = config.color display.fd = sys.stderr if config.display_stderr else sys.stdout configure_timeout(config) - report_locale() + report_locale(isinstance(config, TestConfig) and not config.delegate) display.info('RLIMIT_NOFILE: %s' % (CURRENT_RLIMIT_NOFILE,), verbosity=2) diff --git a/test/lib/ansible_test/_internal/util.py b/test/lib/ansible_test/_internal/util.py index 42cf77a66be..85a366aa3cb 100644 --- a/test/lib/ansible_test/_internal/util.py +++ b/test/lib/ansible_test/_internal/util.py @@ -657,12 +657,12 @@ def common_environment(): return env -def report_locale() -> None: +def report_locale(show_warning: bool) -> None: """Report the configured locale and the locale warning, if applicable.""" display.info(f'Configured locale: {CONFIGURED_LOCALE}', verbosity=1) - if LOCALE_WARNING: + if LOCALE_WARNING and show_warning: display.warning(LOCALE_WARNING)