diff options
author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-10-25 09:56:39 -0700 |
---|---|---|
committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-10-25 09:56:39 -0700 |
commit | daca59235c6be9ae11044aa8bb14e137c0435dd2 (patch) | |
tree | e069741cd25c8d5dd79f800ac769950d57f9d5f7 /tests | |
parent | f601c1c720478bf246ae62e7bb8a141c84d34481 (diff) | |
parent | e6ac60265eecb86b11761c6695172924f36a1ea4 (diff) | |
download | cryptography-daca59235c6be9ae11044aa8bb14e137c0435dd2.tar.gz cryptography-daca59235c6be9ae11044aa8bb14e137c0435dd2.tar.bz2 cryptography-daca59235c6be9ae11044aa8bb14e137c0435dd2.zip |
Merge pull request #1438 from alex/multifernet-tests
Fixed #1436 -- mark the multifernet tests as requiring the backends they need
Diffstat (limited to 'tests')
-rw-r--r-- | tests/test_fernet.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/test_fernet.py b/tests/test_fernet.py index 813ad88f..1aa04171 100644 --- a/tests/test_fernet.py +++ b/tests/test_fernet.py @@ -26,7 +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.backends.interfaces import CipherBackend, HMACBackend from cryptography.hazmat.primitives.ciphers import algorithms, modes import cryptography_vectors @@ -48,6 +48,7 @@ def test_default_backend(): @pytest.mark.requires_backend_interface(interface=CipherBackend) +@pytest.mark.requires_backend_interface(interface=HMACBackend) @pytest.mark.supported( only_if=lambda backend: backend.cipher_supported( algorithms.AES("\x00" * 32), modes.CBC("\x00" * 16) @@ -118,6 +119,8 @@ class TestFernet(object): Fernet(base64.urlsafe_b64encode(b"abc"), backend=backend) +@pytest.mark.requires_backend_interface(interface=CipherBackend) +@pytest.mark.requires_backend_interface(interface=HMACBackend) @pytest.mark.supported( only_if=lambda backend: backend.cipher_supported( algorithms.AES("\x00" * 32), modes.CBC("\x00" * 16) |