ci: Fix version comparisons involving double digits

moreati · moreati · commit e194a6367f2c · 2021-11-22T23:19:03.000Z
See https://gist.github.com/moreati/e7507c5b606b12ec0ddafcb7c8debbf1
diff --git a/ansible_mitogen/target.py b/ansible_mitogen/target.py
@@ -144,7 +144,7 @@ def subprocess__Popen__close_fds(self, but):
 
 if (
     sys.platform.startswith(u'linux') and
-    sys.version < u'3.0' and
+    sys.version_info < (3,) and
     hasattr(subprocess.Popen, u'_close_fds') and
     not mitogen.is_master
 ):
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -27,6 +27,7 @@ v0.3.1.dev0 (unreleased)
 * :gh:issue:`860` Add initial support for podman connection (w/o Ansible support yet)
 * :gh:issue:`873` `python -c ...` first stage no longer uses :py:mod:`platform`` to detect the macOS release
 * :gh:issue:`876` `python -c ...` first stage no longer contains tab characters, to reduce size
+* :gh:issue:`878` Continuous Integration tests now correctly perform comparisons of 2 digit versions
 
 
 v0.3.0 (2021-11-24)
diff --git a/tests/ansible/integration/async/result_shell_echo_hi.yml b/tests/ansible/integration/async/result_shell_echo_hi.yml
@@ -46,7 +46,8 @@
       that:
         - async_out.invocation.module_args.stdin == None
       fail_msg: async_out={{async_out}}
-    when: ansible_version.full > '2.4'
+    when:
+      - ansible_version.full is version('2.4', '>=', strict=True)
     vars:
       async_out: "{{result.content|b64decode|from_json}}"
   tags:
diff --git a/tests/ansible/integration/async/runner_one_job.yml b/tests/ansible/integration/async/runner_one_job.yml
@@ -41,9 +41,9 @@
       - result1.changed == True
       # ansible/b72e989e1837ccad8dcdc926c43ccbc4d8cdfe44
       - |
-        (ansible_version.full is version('2.8', ">=") and
+        (ansible_version.full is version('2.8', ">=", strict=True) and
          result1.cmd == "echo alldone;\nsleep 1;\n") or
-        (ansible_version.full is version('2.8', '<') and
+        (ansible_version.full is version('2.8', '<', strict=True) and
          result1.cmd == "echo alldone;\n sleep 1;")
       - result1.delta|length == 14
       - result1.start|length == 26
@@ -58,12 +58,14 @@
       - result1.stdout == "alldone"
       - result1.stdout_lines == ["alldone"]
       fail_msg: result1={{result1}}
-    when: ansible_version.full is version('2.8', '>')  # ansible#51393
+    when:
+      - ansible_version.full is version('2.8', '>', strict=True)  # ansible#51393
 
   - assert:
       that:
       - result1.failed == False
       fail_msg: result1={{result1}}
-    when: ansible_version.full is version('2.4', '>')
+    when:
+      - ansible_version.full is version('2.4', '>', strict=True)
   tags:
     - runner_one_job
diff --git a/tests/ansible/integration/async/runner_two_simultaneous_jobs.yml b/tests/ansible/integration/async/runner_two_simultaneous_jobs.yml
@@ -62,6 +62,7 @@
       that:
         - result2.stdout == 'im_alive'
       fail_msg: result2={{result2}}
-    when: ansible_version.full > '2.8'  # ansible#51393
+    when:
+      - ansible_version.full is version('2.8', '>=', strict=True)  # ansible#51393
   tags:
     - runner_two_simultaneous_jobs
diff --git a/tests/ansible/integration/connection/reset.yml b/tests/ansible/integration/connection/reset.yml
@@ -10,10 +10,12 @@
       when: not is_mitogen
 
     - debug: msg="reset.yml skipped on Ansible<2.5.6"
-      when: ansible_version.full < '2.5.6'
+      when:
+        - ansible_version.full is version('2.5.6', '<', strict=True)
 
     - meta: end_play
-      when: ansible_version.full < '2.5.6'
+      when:
+        - ansible_version.full is version('2.5.6', '<', strict=True)
 
     - custom_python_detect_environment:
       register: out
diff --git a/tests/ansible/integration/connection/reset_become.yml b/tests/ansible/integration/connection/reset_become.yml
@@ -6,10 +6,12 @@
   gather_facts: false
   tasks:
   - debug: msg="reset_become.yml skipped on Ansible<2.5.6"
-    when: ansible_version.full < '2.5.6'
+    when:
+      - ansible_version.full is version('2.5.6', '<', strict=True)
 
   - meta: end_play
-    when: ansible_version.full < '2.5.6'
+    when:
+      - ansible_version.full is version('2.5.6', '<', strict=True)
 
   - name: save pid of the become acct
     custom_python_detect_environment:
diff --git a/tests/ansible/integration/connection_delegation/delegate_to_template.yml b/tests/ansible/integration/connection_delegation/delegate_to_template.yml
@@ -20,7 +20,8 @@
       when: not is_mitogen
 
     - meta: end_play
-      when: ansible_version.full < '2.4'
+      when:
+        - ansible_version.full is version('2.4', '<', strict=True)
 
     - mitogen_get_stack:
       delegate_to: "{{ physical_host }}"
diff --git a/tests/ansible/integration/context_service/disconnect_cleanup.yml b/tests/ansible/integration/context_service/disconnect_cleanup.yml
@@ -9,7 +9,8 @@
     when: not is_mitogen
 
   - meta: end_play
-    when: ansible_version.full < '2.5.6'
+    when:
+      - ansible_version.full is version('2.5.6', '<', strict=True)
 
   # Start with a clean slate.
   - mitogen_shutdown_all:
diff --git a/tests/ansible/integration/glibc_caches/resolv_conf.yml b/tests/ansible/integration/glibc_caches/resolv_conf.yml
@@ -8,45 +8,44 @@
   vars:
     ansible_become_pass: has_sudo_pubkey_password
   tasks:
-
     - mitogen_test_gethostbyname:
         name: www.google.com
       register: out
-      when: |
-        ansible_virtualization_type == "docker" and
-        ansible_python_version > "2.5"
+      when:
+        - ansible_facts.virtualization_type == "docker"
+        - ansible_facts.python.version_info[:2] >= [2, 5]
 
     - shell: cp /etc/resolv.conf /tmp/resolv.conf
-      when: |
-        ansible_virtualization_type == "docker" and
-        ansible_python_version > "2.5"
+      when:
+        - ansible_facts.virtualization_type == "docker"
+        - ansible_facts.python.version_info[:2] >= [2, 5]
 
     - shell: echo > /etc/resolv.conf
-      when: |
-        ansible_virtualization_type == "docker" and
-        ansible_python_version > "2.5"
+      when:
+        - ansible_facts.virtualization_type == "docker"
+        - ansible_facts.python.version_info[:2] >= [2, 5]
 
     - mitogen_test_gethostbyname:
         name: www.google.com
       register: out
       ignore_errors: true
-      when: |
-        ansible_virtualization_type == "docker" and
-        ansible_python_version > "2.5"
+      when:
+        - ansible_facts.virtualization_type == "docker"
+        - ansible_facts.python.version_info[:2] >= [2, 5]
 
     - shell: cat /tmp/resolv.conf > /etc/resolv.conf
-      when: |
-        ansible_virtualization_type == "docker" and
-        ansible_python_version > "2.5"
+      when:
+        - ansible_facts.virtualization_type == "docker"
+        - ansible_facts.python.version_info[:2] >= [2, 5]
 
     - assert:
         that:
         - out.failed
         - '"Name or service not known" in out.msg or
            "Temporary failure in name resolution" in out.msg'
         fail_msg: out={{out}}
-      when: |
-        ansible_virtualization_type == "docker" and
-        ansible_python_version > "2.5"
+      when:
+        - ansible_facts.virtualization_type == "docker"
+        - ansible_facts.python.version_info[:2] >= [2, 5]
   tags:
     - resolv_conf
diff --git a/tests/ansible/integration/interpreter_discovery/ansible_2_8_tests.yml b/tests/ansible/integration/interpreter_discovery/ansible_2_8_tests.yml
@@ -132,27 +132,45 @@
               that:
               - auto_out.ansible_facts.discovered_interpreter_python == '/usr/bin/python3'
               fail_msg: auto_out={{auto_out}}
-            when: distro == 'fedora' and distro_version is version('23', '>=')
+            when:
+              - distro == 'fedora'
+              - distro_version is version('23.0', '>=', strict=True)
 
-          - name: rhel assertions
+          - name: rhel < 8 assertions
             assert:
               that:
-              # rhel 6/7
-              - (auto_out.ansible_facts.discovered_interpreter_python == '/usr/bin/python' and distro_version is version('8','<')) or distro_version is version('8','>=')
-              # rhel 8+
-              - (auto_out.ansible_facts.discovered_interpreter_python == '/usr/libexec/platform-python' and distro_version is version('8','>=')) or distro_version is version('8','<')
+                - auto_out.ansible_facts.discovered_interpreter_python == '/usr/bin/python'
               fail_msg: auto_out={{auto_out}}
-            when: distro in ('redhat', 'centos')
+            when:
+              - distro in ('redhat', 'centos')
+              - distro_version is version('8.0', '<', strict=true)
 
-          - name: ubuntu assertions
+          - name: rhel 8+ assertions
             assert:
               that:
-              # ubuntu < 16
-              - (auto_out.ansible_facts.discovered_interpreter_python == '/usr/bin/python' and distro_version is version('16.04','<')) or distro_version is version('16.04','>=')
-              # ubuntu >= 16
-              - (auto_out.ansible_facts.discovered_interpreter_python == '/usr/bin/python3' and distro_version is version('16.04','>=')) or distro_version is version('16.04','<')
+                - auto_out.ansible_facts.discovered_interpreter_python == '/usr/libexec/platform-python'
               fail_msg: auto_out={{auto_out}}
-            when: distro == 'ubuntu'
+            when:
+              - distro in ('redhat', 'centos')
+              - distro_version is version('8.0', '>=', strict=true)
+
+          - name: ubuntu < 16.04 assertions
+            assert:
+              that:
+                - auto_out.ansible_facts.discovered_interpreter_python == '/usr/bin/python'
+              fail_msg: auto_out={{auto_out}}
+            when:
+              - distro == 'ubuntu'
+              - distro_version is version('16.04', '<', strict=true)
+
+          - name: ubuntu 16.04+ assertions
+            assert:
+              that:
+                - auto_out.ansible_facts.discovered_interpreter_python == '/usr/bin/python3'
+              fail_msg: auto_out={{auto_out}}
+            when:
+              - distro == 'ubuntu'
+              - distro_version is version('16.04', '>=', strict=True)
 
           - name: mac assertions
             assert:
@@ -163,6 +181,7 @@
 
           always:
           - meta: clear_facts
-      when: ansible_version.full is version_compare('2.8.0', '>=')
+      when:
+        - ansible_version.full is version_compare('2.8.0', '>=', strict=True)
   tags:
     - ansible_2_8_tests
diff --git a/tests/ansible/integration/runner/custom_perl_json_args_module.yml b/tests/ansible/integration/runner/custom_perl_json_args_module.yml
@@ -13,11 +13,12 @@
         - out.results[0].message == 'I am a perl script! Here is my input.'
         fail_msg: out={{out}}
 
-    - when: ansible_version.full > '2.4'
-      assert:
+    - assert:
         that:
         - (not out.changed)
         - (not out.results[0].changed)
         fail_msg: out={{out}}
+      when:
+        - ansible_version.full is version('2.4', '>=', strict=True)
   tags:
     - custom_perl_json_args_module
diff --git a/tests/ansible/integration/runner/custom_perl_want_json_module.yml b/tests/ansible/integration/runner/custom_perl_want_json_module.yml
@@ -13,11 +13,12 @@
         - out.results[0].message == 'I am a want JSON perl script! Here is my input.'
         fail_msg: out={{out}}
 
-    - when: ansible_version.full > '2.4'
-      assert:
+    - assert:
         that:
         - (not out.changed)
         - (not out.results[0].changed)
         fail_msg: out={{out}}
+      when:
+        - ansible_version.full is version('2.4', '>=', strict=True)
   tags:
     - custom_perl_want_json_module
diff --git a/tests/ansible/integration/stub_connections/kubectl.yml b/tests/ansible/integration/stub_connections/kubectl.yml
@@ -8,7 +8,8 @@
     when: not is_mitogen
 
   - meta: end_play
-    when: ansible_version.full < '2.5'
+    when:
+      - ansible_version.full is version('2.5', '<', strict=True)
 
   - custom_python_detect_environment:
     vars:
diff --git a/tests/ansible/lib/modules/custom_python_detect_environment.py b/tests/ansible/lib/modules/custom_python_detect_environment.py
@@ -26,7 +26,15 @@ def all(it):
 def main():
     module = AnsibleModule(argument_spec={})
     module.exit_json(
-        python_version=sys.version[:3],
+        python={
+            'version': {
+                'full': '%i.%i.%i' % sys.version_info[:3],
+                'info': list(sys.version_info),
+                'major': sys.version_info[0],
+                'minor': sys.version_info[1],
+                'patch': sys.version_info[2],
+            },
+        },
         argv=sys.argv,
         __file__=__file__,
         argv_types_correct=all(type(s) is str for s in sys.argv),
diff --git a/tests/ansible/regression/issue_109__target_has_old_ansible_installed.yml b/tests/ansible/regression/issue_109__target_has_old_ansible_installed.yml
@@ -7,7 +7,8 @@
   gather_facts: true
   tasks:
     - meta: end_play
-      when: ansible_version.full < '2.6'
+      when:
+        - ansible_version.full is version('2.6', '<', strict=True)
 
     # Copy the naughty 'ansible' into place.
     - copy:
diff --git a/tests/ansible/regression/issue_152__virtualenv_python_fails.yml b/tests/ansible/regression/issue_152__virtualenv_python_fails.yml
@@ -9,27 +9,31 @@
     # Can't use pip module because it can't create virtualenvs, must call it
     # directly.
     - shell: virtualenv /tmp/issue_152_virtualenv
-      when: lout.python_version > '2.6'
       environment:
         https_proxy: "{{ lookup('env', 'https_proxy')|default('') }}"
         no_proxy: "{{ lookup('env', 'no_proxy')|default('') }}"
         PATH: "{{ lookup('env', 'PATH') }}"
+      when:
+        - lout.python.version.full is version('2.7', '>=', strict=True)
 
     - custom_python_detect_environment:
       vars:
         ansible_python_interpreter: /tmp/issue_152_virtualenv/bin/python
       register: out
-      when: lout.python_version > '2.6'
+      when:
+        - lout.python.version.full is version('2.7', '>=', strict=True)
 
     - assert:
         that:
           - out.sys_executable == "/tmp/issue_152_virtualenv/bin/python"
         fail_msg: out={{out}}
-      when: lout.python_version > '2.6'
+      when:
+        - lout.python.version.full is version('2.7', '>=', strict=True)
 
     - file:
         path: /tmp/issue_152_virtualenv
         state: absent
-      when: lout.python_version > '2.6'
+      when:
+        - lout.python.version.full is version('2.7', '>=', strict=True)
   tags:
     - issue_152
diff --git a/tests/ansible/regression/issue_590__sys_modules_crap.yml b/tests/ansible/regression/issue_590__sys_modules_crap.yml
@@ -2,7 +2,8 @@
 - hosts: test-targets
   tasks:
   - meta: end_play
-    when: ansible_version.full < '2.8'
+    when:
+      - ansible_version.full is version('2.8', '<', strict=True)
 
   - custom_python_uses_distro:
     register: out
