Ensure removed_in is StrictVersion before comparing (#43835)

* Ensure removed_in is StrictVersion before comparing * Catch ValueError with StrictVersion on incompatible versions
7 years ago · 54e4c53f00
parent 35f625ee3b
commit 54e4c53f00
1 changed files with 8 additions and 4 deletions
--- a/test/sanity/validate-modules/main.py
+++ b/test/sanity/validate-modules/main.py
@ -1374,7 +1374,11 @@ class ModuleValidator(Validator):

            # See if current version => deprecated.removed_in, ie, should be docs only
            if docs and 'deprecated' in docs and docs['deprecated'] is not None:
-                removed_in = docs.get('deprecated')['removed_in']
+                try:
+                    removed_in = StrictVersion(str(docs.get('deprecated')['removed_in']))
+                except ValueError:
+                    end_of_deprecation_should_be_docs_only = False
+                else:
                    strict_ansible_version = StrictVersion('.'.join(ansible_version.split('.')[:2]))
                    end_of_deprecation_should_be_docs_only = strict_ansible_version >= removed_in
                    # FIXME if +2 then file should be empty? - maybe add this only in the future