diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-03-16 13:12:18 -0430 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-03-16 13:12:18 -0430 |
| commit | 563896ff3544c99c13596f46897e16c0b58fc9ab (patch) | |
| tree | a1c05dbf8c35713a7752278b664f6a63d0854451 /tests/conftest.py | |
| parent | e171c5fcf47263d4aee35c555844e4c4d7aec5f0 (diff) | |
| parent | 01de3ef02b63f158b7f3718472b0f13036c584c8 (diff) | |
| download | cryptography-563896ff3544c99c13596f46897e16c0b58fc9ab.tar.gz cryptography-563896ff3544c99c13596f46897e16c0b58fc9ab.tar.bz2 cryptography-563896ff3544c99c13596f46897e16c0b58fc9ab.zip | |
Merge pull request #812 from public/circular-fix
Fix circular imports with available_backends()
Diffstat (limited to 'tests/conftest.py')
| -rw-r--r-- | tests/conftest.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/conftest.py b/tests/conftest.py index 0069f2c0..36183f46 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -15,7 +15,7 @@ from __future__ import absolute_import, division, print_function import pytest -from cryptography.hazmat.backends import _ALL_BACKENDS +from cryptography.hazmat.backends import _available_backends from cryptography.hazmat.backends.interfaces import ( HMACBackend, CipherBackend, HashBackend, PBKDF2HMACBackend, RSABackend ) @@ -25,7 +25,7 @@ from .utils import check_for_iface, check_backend_support, select_backends def pytest_generate_tests(metafunc): names = metafunc.config.getoption("--backend") - selected_backends = select_backends(names, _ALL_BACKENDS) + selected_backends = select_backends(names, _available_backends()) if "backend" in metafunc.fixturenames: metafunc.parametrize("backend", selected_backends) |