diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-09-08 09:51:24 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-09-08 09:51:24 -0700 |
| commit | 38b11cc978c9b1eacc5c1902628a9542ad5f104f (patch) | |
| tree | 816297750f737579234a322534a3a997386a9251 /tests/hazmat/backends | |
| parent | e0e9541322cd9186d62f0d807efd77b3467b3ad3 (diff) | |
| parent | e9d027a99b7b945e4254e2ddd407c34d500cd22d (diff) | |
| download | cryptography-38b11cc978c9b1eacc5c1902628a9542ad5f104f.tar.gz cryptography-38b11cc978c9b1eacc5c1902628a9542ad5f104f.tar.bz2 cryptography-38b11cc978c9b1eacc5c1902628a9542ad5f104f.zip | |
Merge branch 'master' into pem-loading-backend
Diffstat (limited to 'tests/hazmat/backends')
| -rw-r--r-- | tests/hazmat/backends/test_commoncrypto.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/hazmat/backends/test_commoncrypto.py b/tests/hazmat/backends/test_commoncrypto.py index e2c6f4a0..28d1a6ca 100644 --- a/tests/hazmat/backends/test_commoncrypto.py +++ b/tests/hazmat/backends/test_commoncrypto.py @@ -17,7 +17,7 @@ import pytest from cryptography import utils from cryptography.exceptions import InternalError, _Reasons -from cryptography.hazmat.bindings.commoncrypto.binding import Binding +from cryptography.hazmat.backends import _available_backends from cryptography.hazmat.primitives import interfaces from cryptography.hazmat.primitives.ciphers.algorithms import AES from cryptography.hazmat.primitives.ciphers.base import Cipher @@ -32,7 +32,8 @@ class DummyCipher(object): block_size = 128 -@pytest.mark.skipif(not Binding.is_available(), +@pytest.mark.skipif("commoncrypto" not in + [i.name for i in _available_backends()], reason="CommonCrypto not available") class TestCommonCrypto(object): def test_supports_cipher(self): |