diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-09-09 21:13:39 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-09-09 21:13:39 -0500 |
| commit | b8599c085d3e295f460f0117f7df9288a4841d7f (patch) | |
| tree | 6b6e8d52a3167b4f7540ada271fd3b6dd0d4f70c /tests/conftest.py | |
| parent | 86dd8345a9bd8f826b950b4574072427676f43b3 (diff) | |
| parent | 4e5d1eeb574b3abfe93f81975984d5d4ef688006 (diff) | |
| download | cryptography-b8599c085d3e295f460f0117f7df9288a4841d7f.tar.gz cryptography-b8599c085d3e295f460f0117f7df9288a4841d7f.tar.bz2 cryptography-b8599c085d3e295f460f0117f7df9288a4841d7f.zip | |
Merge pull request #1326 from alex/pem-serialization-backend
Start moving everything to the new API
Diffstat (limited to 'tests/conftest.py')
| -rw-r--r-- | tests/conftest.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/conftest.py b/tests/conftest.py index af146386..b7981c9d 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, EllipticCurveBackend, HMACBackend, - HashBackend, PBKDF2HMACBackend, PKCS8SerializationBackend, RSABackend, + HashBackend, PBKDF2HMACBackend, PEMSerializationBackend, + PKCS8SerializationBackend, RSABackend, TraditionalOpenSSLSerializationBackend ) from .utils import check_backend_support, check_for_iface, select_backends @@ -48,6 +49,7 @@ def pytest_runtest_setup(item): ) check_for_iface("pkcs8_serialization", PKCS8SerializationBackend, item) check_for_iface("elliptic", EllipticCurveBackend, item) + check_for_iface("pem_serialization", PEMSerializationBackend, item) check_backend_support(item) |