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/hazmat/primitives/test_hmac.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/hazmat/primitives/test_hmac.py')
-rw-r--r-- | tests/hazmat/primitives/test_hmac.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/hazmat/primitives/test_hmac.py b/tests/hazmat/primitives/test_hmac.py index 21be73a3..01b1cdcb 100644 --- a/tests/hazmat/primitives/test_hmac.py +++ b/tests/hazmat/primitives/test_hmac.py @@ -41,14 +41,14 @@ class UnsupportedDummyHash(object): only_if=lambda backend: backend.hmac_supported(hashes.MD5()), skip_message="Does not support MD5", ) -@pytest.mark.hmac +@pytest.mark.requires_backend_interface(interface=HMACBackend) class TestHMACCopy(object): test_copy = generate_base_hmac_test( hashes.MD5(), ) -@pytest.mark.hmac +@pytest.mark.requires_backend_interface(interface=HMACBackend) class TestHMAC(object): def test_hmac_reject_unicode(self, backend): h = hmac.HMAC(b"mykey", hashes.SHA1(), backend=backend) |