From 8f82e6327f57d351a0016f44ef47b651393148d3 Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Fri, 4 Jun 2021 00:37:54 +0530 Subject: [PATCH] ansible-cli: Remove unnessary trailing space (#74880) Fixes: #74875 Signed-off-by: Abhijeet Kasurde --- changelogs/fragments/74875_ansible_version.yml | 3 +++ lib/ansible/cli/arguments/option_helpers.py | 2 +- test/units/cli/test_adhoc.py | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 changelogs/fragments/74875_ansible_version.yml diff --git a/changelogs/fragments/74875_ansible_version.yml b/changelogs/fragments/74875_ansible_version.yml new file mode 100644 index 00000000000..699d4f437eb --- /dev/null +++ b/changelogs/fragments/74875_ansible_version.yml @@ -0,0 +1,3 @@ +--- +minor_changes: +- ansible-cli - remove unnecessary trailing space in ``ansible --version`` (https://github.com/ansible/ansible/issues/74875). diff --git a/lib/ansible/cli/arguments/option_helpers.py b/lib/ansible/cli/arguments/option_helpers.py index d440521bac6..0447d8238a5 100644 --- a/lib/ansible/cli/arguments/option_helpers.py +++ b/lib/ansible/cli/arguments/option_helpers.py @@ -152,7 +152,7 @@ def _gitinfo(): def version(prog=None): """ return ansible version """ if prog: - result = ["{0} [core {1}] ".format(prog, __version__)] + result = ["{0} [core {1}]".format(prog, __version__)] else: result = [__version__] diff --git a/test/units/cli/test_adhoc.py b/test/units/cli/test_adhoc.py index bb2ed165275..18775f5da93 100644 --- a/test/units/cli/test_adhoc.py +++ b/test/units/cli/test_adhoc.py @@ -105,7 +105,7 @@ def test_ansible_version(capsys, mocker): version_lines = version[0].splitlines() assert len(version_lines) == 9, 'Incorrect number of lines in "ansible --version" output' - assert re.match(r'ansible \[core [0-9.a-z]+\]', version_lines[0]), 'Incorrect ansible version line in "ansible --version" output' + assert re.match(r'ansible \[core [0-9.a-z]+\]$', version_lines[0]), 'Incorrect ansible version line in "ansible --version" output' assert re.match(' config file = .*$', version_lines[1]), 'Incorrect config file line in "ansible --version" output' assert re.match(' configured module search path = .*$', version_lines[2]), 'Incorrect module search path in "ansible --version" output' assert re.match(' ansible python module location = .*$', version_lines[3]), 'Incorrect python module location in "ansible --version" output'