aboutsummaryrefslogtreecommitdiffstats
path: root/tests/conftest.py
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2017-05-20 18:36:19 -0700
committerPaul Kehrer <paul.l.kehrer@gmail.com>2017-05-20 18:36:19 -0700
commitf9b3b1592d1e0fb0e49b46d603cf0301f7d31cf3 (patch)
treebd8b67bd713c7361bc51dd8398bdc7c755b24019 /tests/conftest.py
parent846ae1c789ed2d611a888295f97bf25d3e36085b (diff)
downloadcryptography-f9b3b1592d1e0fb0e49b46d603cf0301f7d31cf3.tar.gz
cryptography-f9b3b1592d1e0fb0e49b46d603cf0301f7d31cf3.tar.bz2
cryptography-f9b3b1592d1e0fb0e49b46d603cf0301f7d31cf3.zip
Delete some code (#3563)
* Delete some code * removed import * delete more code
Diffstat (limited to 'tests/conftest.py')
-rw-r--r--tests/conftest.py18
1 files changed, 7 insertions, 11 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index 8605f3ae..66a3cd64 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -8,7 +8,7 @@ import pytest
from cryptography.hazmat.backends.openssl import backend as openssl_backend
-from .utils import check_backend_support, select_backends, skip_if_empty
+from .utils import check_backend_support, skip_if_empty
def pytest_report_header(config):
@@ -17,19 +17,15 @@ def pytest_report_header(config):
def pytest_generate_tests(metafunc):
if "backend" in metafunc.fixturenames:
- names = metafunc.config.getoption("--backend")
- selected_backends = select_backends(names, [openssl_backend])
-
filtered_backends = []
- required = metafunc.function.requires_backend_interface
required_interfaces = [
- mark.kwargs["interface"] for mark in required
+ mark.kwargs["interface"]
+ for mark in metafunc.function.requires_backend_interface
]
- for backend in selected_backends:
- if all(
- isinstance(backend, iface) for iface in required_interfaces
- ):
- filtered_backends.append(backend)
+ if all(
+ isinstance(openssl_backend, iface) for iface in required_interfaces
+ ):
+ filtered_backends.append(openssl_backend)
# If you pass an empty list to parametrize Bad Things(tm) happen
# as of pytest 2.6.4 when the test also has a parametrize decorator