1 files changed, 36 insertions, 28 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index c4d6b9c1..fd690ce7 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -6,39 +6,47 @@ from __future__ import absolute_import, division, print_function
 
 import pytest
 
-from cryptography.hazmat.backends import _available_backends
+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, load_wycheproof_tests, skip_if_wycheproof_none
+)
 
 
-def pytest_generate_tests(metafunc):
-    names = metafunc.config.getoption("--backend")
-    selected_backends = select_backends(names, _available_backends())
-
-    if "backend" in metafunc.fixturenames:
-        filtered_backends = []
-        required = metafunc.function.requires_backend_interface
-        required_interfaces = tuple(
-            mark.kwargs["interface"] for mark in required
-        )
-        for backend in selected_backends:
-            if isinstance(backend, required_interfaces):
-                filtered_backends.append(backend)
+def pytest_report_header(config):
+    return "OpenSSL: {}".format(openssl_backend.openssl_version_text())
 
-        # 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
-        skip_if_empty(filtered_backends, required_interfaces)
-
-        metafunc.parametrize("backend", filtered_backends)
 
+def pytest_addoption(parser):
+    parser.addoption("--wycheproof-root", default=None)
 
-@pytest.mark.trylast
-def pytest_runtest_setup(item):
-    check_backend_support(item)
 
+def pytest_generate_tests(metafunc):
+    if "wycheproof" in metafunc.fixturenames:
+        wycheproof = metafunc.config.getoption("--wycheproof-root")
+        skip_if_wycheproof_none(wycheproof)
+
+        testcases = []
+        marker = metafunc.definition.get_closest_marker("wycheproof_tests")
+        for path in marker.args:
+            testcases.extend(load_wycheproof_tests(wycheproof, path))
+        metafunc.parametrize("wycheproof", testcases)
+
+
+@pytest.fixture()
+def backend(request):
+    required_interfaces = [
+        mark.kwargs["interface"]
+        for mark in request.node.iter_markers("requires_backend_interface")
+    ]
+    if not all(
+        isinstance(openssl_backend, iface) for iface in required_interfaces
+    ):
+        pytest.skip(
+            "OpenSSL doesn't implement required interfaces: {}".format(
+                required_interfaces
+            )
+        )
 
-def pytest_addoption(parser):
-    parser.addoption(
-        "--backend", action="store", metavar="NAME",
-        help="Only run tests matching the backend NAME."
-    )
+    check_backend_support(openssl_backend, request)
+    return openssl_backend