[stable-2.11] version test - improve message when value is empty (#74754) (#74789)

When an empty value is provided, no `version` attribute will exist on the `LooseVersion` or
`StrictVersion` object. We catch and handle this, but it's not immediatebly clear that an
AttributeError means an empty value was provided.

Specifically handle the case where value or version are empty and add more
helpful error messages.

Add integration tests.
(cherry picked from commit 71e33d2578)

Co-authored-by: Sam Doran <sdoran@redhat.com>
pull/74984/head
Sam Doran 4 years ago committed by GitHub
parent 46378f0086
commit 578fa17af5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -0,0 +1,2 @@
bugfixes:
- version test - improve error message when an empty version is provided

@ -168,6 +168,12 @@ def version_compare(value, version, operator='eq', strict=None, version_type=Non
if strict is not None and version_type is not None:
raise errors.AnsibleFilterError("Cannot specify both 'strict' and 'version_type'")
if not value:
raise errors.AnsibleFilterError("Input version value cannot be empty")
if not version:
raise errors.AnsibleFilterError("Version parameter to compare against cannot be empty")
Version = LooseVersion
if strict:
Version = StrictVersion

@ -235,6 +235,24 @@
ignore_errors: yes
register: version_bad_semver
- name: Try version with empty input value
debug:
msg: "{{ '' is version('1.0', '>') }}"
ignore_errors: yes
register: version_empty_input
- name: Try version with empty comparison value
debug:
msg: "{{ '1.0' is version('', '>') }}"
ignore_errors: yes
register: version_empty_comparison
- name: Try version with empty input and comparison values
debug:
msg: "{{ '' is version('', '>') }}"
ignore_errors: yes
register: version_empty_both
- name: Assert version tests work
assert:
that:
@ -258,6 +276,12 @@
- version_strict_version_type is failed
- version_bad_version_type is failed
- version_bad_semver is failed
- version_empty_input is failed
- version_empty_input is search('version value cannot be empty')
- version_empty_comparison is failed
- version_empty_comparison is search('to compare against cannot be empty')
- version_empty_both is failed
- version_empty_both is search('version value cannot be empty')
- name: Assert any tests work
assert:
@ -288,7 +312,7 @@
- '"off" is not truthy(convert_bool=True)'
- '"fred" is truthy(convert_bool=True)'
- '{} is not truthy'
- '{"key": "value"} is truthy'
- '{"key": "value"} is truthy'
- name: Assert falsy tests work
assert:

Loading…
Cancel
Save