diff options
author | Alex Stapleton <alexs@prol.etari.at> | 2014-05-23 21:42:24 +0100 |
---|---|---|
committer | Alex Stapleton <alexs@prol.etari.at> | 2014-05-27 21:50:30 +0100 |
commit | 00c580cca9a36225ea7d41b0b98c985977884e9f (patch) | |
tree | 7105da9e2189f305ef231b0dc61c34b74ca170f3 | |
parent | 194eef0604991ea75fd1150314db756b07be3203 (diff) | |
download | cryptography-00c580cca9a36225ea7d41b0b98c985977884e9f.tar.gz cryptography-00c580cca9a36225ea7d41b0b98c985977884e9f.tar.bz2 cryptography-00c580cca9a36225ea7d41b0b98c985977884e9f.zip |
Add pkcs8_serialization mark
-rw-r--r-- | tests/conftest.py | 8 | ||||
-rw-r--r-- | tests/hazmat/primitives/test_serialization.py | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/tests/conftest.py b/tests/conftest.py index 86d5a03b..b1326dc8 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -18,7 +18,8 @@ import pytest from cryptography.hazmat.backends import _available_backends from cryptography.hazmat.backends.interfaces import ( CMACBackend, CipherBackend, DSABackend, HMACBackend, HashBackend, - PBKDF2HMACBackend, RSABackend, TraditionalOpenSSLSerializationBackend + PBKDF2HMACBackend, PKCS8SerializationBackend, RSABackend, + TraditionalOpenSSLSerializationBackend ) from .utils import check_backend_support, check_for_iface, select_backends @@ -45,6 +46,11 @@ def pytest_runtest_setup(item): TraditionalOpenSSLSerializationBackend, item ) + check_for_iface( + "pkcs8_serialization", + PKCS8SerializationBackend, + item + ) check_backend_support(item) diff --git a/tests/hazmat/primitives/test_serialization.py b/tests/hazmat/primitives/test_serialization.py index a38450dc..9e735ec3 100644 --- a/tests/hazmat/primitives/test_serialization.py +++ b/tests/hazmat/primitives/test_serialization.py @@ -249,7 +249,7 @@ class TestTraditionalOpenSSLSerialisation(object): ) -@pytest.mark.traditional_openssl_serialization +@pytest.mark.pkcs8_serialization class TestPKCS8Serialisation(object): @pytest.mark.parametrize( ("key_file", "password"), |