aboutsummaryrefslogtreecommitdiff
path: root/tests/conftest.py
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2020-12-09 11:04:47 -0500
committerGitHub <noreply@github.com>2020-12-09 10:04:47 -0600
commit057a9fcf3444c0edf2b7589902d976c44030b2e1 (patch)
tree94eae261976295e4fdc0536e8b8b948fab06395b /tests/conftest.py
parente66db8079d3fbd0110e87ece1fd48f4bfd9e48b9 (diff)
downloadpyca-cryptography-057a9fcf3444c0edf2b7589902d976c44030b2e1.zip
pyca-cryptography-057a9fcf3444c0edf2b7589902d976c44030b2e1.tar.gz
pyca-cryptography-057a9fcf3444c0edf2b7589902d976c44030b2e1.tar.bz2
fixes #5611 -- use subtests for wycheproof tests for speed (#5616)
Diffstat (limited to 'tests/conftest.py')
-rw-r--r--tests/conftest.py16
1 files changed, 1 insertions, 15 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index 77691c2..43debdd 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -7,10 +7,7 @@ import pytest
from cryptography.hazmat.backends.openssl import backend as openssl_backend
-from .utils import (
- check_backend_support,
- load_wycheproof_tests,
-)
+from .utils import check_backend_support
def pytest_report_header(config):
@@ -26,17 +23,6 @@ def pytest_addoption(parser):
parser.addoption("--wycheproof-root", default=None)
-def pytest_generate_tests(metafunc):
- if "wycheproof" in metafunc.fixturenames:
- wycheproof = metafunc.config.getoption("--wycheproof-root", skip=True)
-
- 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)
-
-
def pytest_runtest_setup(item):
if openssl_backend._fips_enabled:
for marker in item.iter_markers(name="skip_fips"):