diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-10-24 07:49:33 -0700 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-10-24 07:49:33 -0700 |
| commit | f484d1ef03bc548dde300a59c91474d82169b1be (patch) | |
| tree | f3d79d1c6a22db5b90a5810ffe1a432be9c912df /tests/test_fernet.py | |
| parent | 971b98d40ed1cb6b6eecba7a83c0ff4a1ef89c5f (diff) | |
| parent | 2f2346344ae5561bc9b106cbb452efeebe3cdc45 (diff) | |
| download | cryptography-f484d1ef03bc548dde300a59c91474d82169b1be.tar.gz cryptography-f484d1ef03bc548dde300a59c91474d82169b1be.tar.bz2 cryptography-f484d1ef03bc548dde300a59c91474d82169b1be.zip | |
Merge branch 'master' into verify-interfaces
Conflicts:
cryptography/hazmat/primitives/hmac.py
Diffstat (limited to 'tests/test_fernet.py')
| -rw-r--r-- | tests/test_fernet.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/test_fernet.py b/tests/test_fernet.py index 5c630b9e..813ad88f 100644 --- a/tests/test_fernet.py +++ b/tests/test_fernet.py @@ -26,6 +26,7 @@ import six from cryptography.fernet import Fernet, InvalidToken, MultiFernet from cryptography.hazmat.backends import default_backend +from cryptography.hazmat.backends.interfaces import CipherBackend from cryptography.hazmat.primitives.ciphers import algorithms, modes import cryptography_vectors @@ -46,7 +47,7 @@ def test_default_backend(): assert f._backend is default_backend() -@pytest.mark.cipher +@pytest.mark.requires_backend_interface(interface=CipherBackend) @pytest.mark.supported( only_if=lambda backend: backend.cipher_supported( algorithms.AES("\x00" * 32), modes.CBC("\x00" * 16) |