diff options
| -rw-r--r-- | Jenkinsfile | 8 | ||||
| -rw-r--r-- | tests/hazmat/backends/test_openssl.py | 8 |
2 files changed, 1 insertions, 15 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index e4475741..9fb9ad15 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,14 +12,6 @@ def configs = [ toxenvs: ['py27', 'py34', 'py35', 'py36', 'py37'], ], [ - label: 'sierra', - toxenvs: ['py27', 'py36'], - ], - [ - label: 'yosemite', - toxenvs: ['py27'], - ], - [ label: 'docker', imageName: 'pyca/cryptography-runner-sid', toxenvs: ['docs'], diff --git a/tests/hazmat/backends/test_openssl.py b/tests/hazmat/backends/test_openssl.py index b7c7e598..8e765dd4 100644 --- a/tests/hazmat/backends/test_openssl.py +++ b/tests/hazmat/backends/test_openssl.py @@ -10,8 +10,6 @@ import subprocess import sys import textwrap -from pkg_resources import parse_version - import pytest from cryptography import x509 @@ -275,11 +273,7 @@ class TestOpenSSLRandomEngine(object): if sys.platform.startswith('linux'): assert name in ['getrandom', '/dev/urandom'] if sys.platform == 'darwin': - # macOS 10.12+ supports getentropy - if parse_version(os.uname()[2]) >= parse_version("16.0"): - assert name == 'getentropy' - else: - assert name == '/dev/urandom' + assert name in ['getentropy', '/dev/urandom'] if sys.platform == 'win32': assert name == 'CryptGenRandom' |