From 08404fc511cafb2d5569ad26845e022c11e90d4f Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Tue, 9 Nov 2021 13:57:30 -0800 Subject: [PATCH] [stable-2.10] Fix pip integration test. - Use `fallible==0.0.1a2` instead of `black==19.10b` - Test on both Python 2 and 3. (cherry picked from commit b6725ec6c994d725cc2190b784a422299fd98385) Co-authored-by: Matt Clay --- test/integration/targets/pip/tasks/pip.yml | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/test/integration/targets/pip/tasks/pip.yml b/test/integration/targets/pip/tasks/pip.yml index 572c7b6f312..a5ea79ed190 100644 --- a/test/integration/targets/pip/tasks/pip.yml +++ b/test/integration/targets/pip/tasks/pip.yml @@ -547,27 +547,24 @@ # https://github.com/ansible/ansible/issues/68592 # Handle pre-release version numbers in check_mode for already-installed # packages. -# TODO: Limiting to py3 test boxes for now so the example of 'black' installs, -# we should probably find another package to use with a similar versioning -# scheme or make a small one and enable this test for py2 as well. - block: - - name: Install a beta version of a package + - name: Install a pre-release version of a package pip: - name: black - version: 19.10b0 + name: fallible + version: 0.0.1a2 state: present - name: Use check_mode and ensure that the package is shown as installed check_mode: true pip: - name: black + name: fallible state: present register: pip_prereleases - - name: Uninstall the beta package if we need to + - name: Uninstall the pre-release package if we need to pip: - name: black - version: 19.10b0 + name: fallible + version: 0.0.1a2 state: absent when: pip_prereleases is changed @@ -575,6 +572,4 @@ that: - pip_prereleases is successful - pip_prereleases is not changed - - '"black==19.10b0" in pip_prereleases.stdout_lines' - - when: ansible_python.version.major == 3 + - '"fallible==0.0.1a2" in pip_prereleases.stdout_lines'