aboutsummaryrefslogtreecommitdiffstats
path: root/tests/hazmat/primitives/test_ec.py
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-10-24 07:49:33 -0700
committerAlex Gaynor <alex.gaynor@gmail.com>2014-10-24 07:49:33 -0700
commitf484d1ef03bc548dde300a59c91474d82169b1be (patch)
treef3d79d1c6a22db5b90a5810ffe1a432be9c912df /tests/hazmat/primitives/test_ec.py
parent971b98d40ed1cb6b6eecba7a83c0ff4a1ef89c5f (diff)
parent2f2346344ae5561bc9b106cbb452efeebe3cdc45 (diff)
downloadcryptography-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_ec.py')
-rw-r--r--tests/hazmat/primitives/test_ec.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/hazmat/primitives/test_ec.py b/tests/hazmat/primitives/test_ec.py
index 9ed762cb..683df046 100644
--- a/tests/hazmat/primitives/test_ec.py
+++ b/tests/hazmat/primitives/test_ec.py
@@ -89,7 +89,7 @@ class DeprecatedDummyECBackend(object):
return b"public_key"
-@pytest.mark.elliptic
+@pytest.mark.requires_backend_interface(interface=EllipticCurveBackend)
def test_skip_curve_unsupported(backend):
with pytest.raises(pytest.skip.Exception):
_skip_curve_unsupported(backend, DummyCurve())
@@ -147,7 +147,7 @@ def test_ec_numbers():
)
-@pytest.mark.elliptic
+@pytest.mark.requires_backend_interface(interface=EllipticCurveBackend)
class TestECWithNumbers(object):
@pytest.mark.parametrize(
("vector", "hash_type"),
@@ -183,7 +183,7 @@ class TestECWithNumbers(object):
assert curve_type().name == priv_num.public_numbers.curve.name
-@pytest.mark.elliptic
+@pytest.mark.requires_backend_interface(interface=EllipticCurveBackend)
class TestECDSAVectors(object):
@pytest.mark.parametrize(
("vector", "hash_type"),