Delete some code (#3563)
* Delete some code
* removed import
* delete more code
diff --git a/tests/conftest.py b/tests/conftest.py
index 8605f3a..66a3cd6 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -8,7 +8,7 @@
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_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
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 0f69523..1637ba5 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -24,8 +24,7 @@
load_hash_vectors, load_kasvs_dh_vectors,
load_kasvs_ecdh_vectors, load_nist_kbkdf_vectors, load_nist_vectors,
load_pkcs1_vectors, load_rsa_nist_vectors, load_vectors_from_file,
- load_x963_vectors, raises_unsupported_algorithm, select_backends,
- skip_if_empty
+ load_x963_vectors, raises_unsupported_algorithm, skip_if_empty
)
@@ -33,48 +32,6 @@
pass
-def test_select_one_backend():
- b1 = pretend.stub(name="b1")
- b2 = pretend.stub(name="b2")
- b3 = pretend.stub(name="b3")
- backends = [b1, b2, b3]
- name = "b2"
- selected_backends = select_backends(name, backends)
- assert len(selected_backends) == 1
- assert selected_backends[0] == b2
-
-
-def test_select_no_backend():
- b1 = pretend.stub(name="b1")
- b2 = pretend.stub(name="b2")
- b3 = pretend.stub(name="b3")
- backends = [b1, b2, b3]
- name = "back!"
- with pytest.raises(ValueError):
- select_backends(name, backends)
-
-
-def test_select_backends_none():
- b1 = pretend.stub(name="b1")
- b2 = pretend.stub(name="b2")
- b3 = pretend.stub(name="b3")
- backends = [b1, b2, b3]
- name = None
- selected_backends = select_backends(name, backends)
- assert len(selected_backends) == 3
-
-
-def test_select_two_backends():
- b1 = pretend.stub(name="b1")
- b2 = pretend.stub(name="b2")
- b3 = pretend.stub(name="b3")
- backends = [b1, b2, b3]
- name = "b2 ,b1 "
- selected_backends = select_backends(name, backends)
- assert len(selected_backends) == 2
- assert selected_backends == [b1, b2]
-
-
def test_skip_if_empty():
with pytest.raises(pytest.skip.Exception):
skip_if_empty([], [FakeInterface])
diff --git a/tests/utils.py b/tests/utils.py
index dc7377a..44e16a5 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -25,23 +25,6 @@
)
-def select_backends(names, backend_list):
- if names is None:
- return backend_list
- split_names = [x.strip() for x in names.split(',')]
- selected_backends = []
- for backend in backend_list:
- if backend.name in split_names:
- selected_backends.append(backend)
-
- if len(selected_backends) > 0:
- return selected_backends
- else:
- raise ValueError(
- "No backend selected. Tried to select: {0}".format(split_names)
- )
-
-
def skip_if_empty(backend_list, required_interfaces):
if not backend_list:
pytest.skip(