diff options
| author | Matt Clay <matt@mystile.com> | 2022-02-21 19:15:30 -0800 |
|---|---|---|
| committer | Matt Clay <matt@mystile.com> | 2022-02-22 11:36:21 -0800 |
| commit | d6b6c95498ab7c1e20477d102ffec2e315bb4a82 (patch) | |
| tree | 6afa602090c731f5ffb3d91fdc83b235f40a439e | |
| parent | d00331354405a1fe5730a72aac9232dfc774b887 (diff) | |
| download | ansible-d6b6c95498ab7c1e20477d102ffec2e315bb4a82.tar.gz | |
ansible-test - Omit pyopenssl for sanity tests.
| -rw-r--r-- | changelogs/fragments/ansible-test-pyopenssl.yml | 2 | ||||
| -rw-r--r-- | test/lib/ansible_test/_internal/executor.py | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/changelogs/fragments/ansible-test-pyopenssl.yml b/changelogs/fragments/ansible-test-pyopenssl.yml index 9d5c68a7fb..237355ed8c 100644 --- a/changelogs/fragments/ansible-test-pyopenssl.yml +++ b/changelogs/fragments/ansible-test-pyopenssl.yml @@ -1,4 +1,4 @@ bugfixes: - - ansible-test - Install ``pyopenssl`` when installing ``cryptography`` to make sure a compatible version is used. + - ansible-test - Install ``pyopenssl`` when installing ``cryptography`` to make sure a compatible version is used (except for sanity tests). minor_changes: - ansible-test - Integration and unit tests no longer install ``cryptography`` if it is already installed. diff --git a/test/lib/ansible_test/_internal/executor.py b/test/lib/ansible_test/_internal/executor.py index 912e5ae255..8fa18c5326 100644 --- a/test/lib/ansible_test/_internal/executor.py +++ b/test/lib/ansible_test/_internal/executor.py @@ -312,7 +312,12 @@ def get_cryptography_requirements(args, python, python_version): # type: (Envir # pyopenssl 17.5.0 requires cryptography 2.1.4 or later pyopenssl = 'pyopenssl < 17.5.0' - return [cryptography, pyopenssl] + requirements = [cryptography, pyopenssl] + + if args.command == 'sanity': + requirements.remove(pyopenssl) # sanity tests do not use pyopenssl + + return requirements def install_command_requirements(args, python_version=None, context=None, enable_pyyaml_check=False): |