From 4794b98f2a9667fc6e964bcb6a36677f6de04475 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Fri, 29 May 2020 17:25:14 +0200 Subject: [PATCH] Fix version_added test (#69756) * Fix version_added test for changes in #69680. * Fix error message. --- .../_data/sanity/validate-modules/validate_modules/main.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/lib/ansible_test/_data/sanity/validate-modules/validate_modules/main.py b/test/lib/ansible_test/_data/sanity/validate-modules/validate_modules/main.py index f45f59a8f77..d7eac807315 100644 --- a/test/lib/ansible_test/_data/sanity/validate-modules/validate_modules/main.py +++ b/test/lib/ansible_test/_data/sanity/validate-modules/validate_modules/main.py @@ -2024,7 +2024,7 @@ class ModuleValidator(Validator): try: mod_version_added = self.StrictVersion() mod_version_added.parse( - str(existing_doc.get('version_added', '0.0')) + self._extract_version_from_tag_for_msg(str(existing_doc.get('version_added', '0.0'))) ) except ValueError: mod_version_added = self.StrictVersion('0.0') @@ -2062,7 +2062,7 @@ class ModuleValidator(Validator): self.reporter.error( path=self.object_path, code='option-incorrect-version-added', - msg=('version_added for new option (%s) should ' + msg=('version_added for existing option (%s) should ' 'be %r. Currently %r' % (option, existing_version, current_version)) ) @@ -2071,7 +2071,7 @@ class ModuleValidator(Validator): try: version_added = self.StrictVersion() version_added.parse( - str(details.get('version_added', '0.0')) + self._extract_version_from_tag_for_msg(str(details.get('version_added', '0.0'))) ) except ValueError: # already reported during schema validation