From 00c580cca9a36225ea7d41b0b98c985977884e9f Mon Sep 17 00:00:00 2001 From: Alex Stapleton Date: Fri, 23 May 2014 21:42:24 +0100 Subject: Add pkcs8_serialization mark --- tests/conftest.py | 8 +++++++- tests/hazmat/primitives/test_serialization.py | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'tests') 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"), -- cgit v1.2.3