aboutsummaryrefslogtreecommitdiff
path: root/tests/conftest.py
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2020-11-20 12:22:47 -0500
committerGitHub <noreply@github.com>2020-11-20 11:22:47 -0600
commit2b85c4d9156ab4bd44e55b2843bd1233a7a5d9ef (patch)
tree02458739fa05030014d107b1383273a9a03e2e26 /tests/conftest.py
parentfd582e8913a4c061ea35025a528331f9ac851651 (diff)
downloadpyca-cryptography-2b85c4d9156ab4bd44e55b2843bd1233a7a5d9ef.zip
pyca-cryptography-2b85c4d9156ab4bd44e55b2843bd1233a7a5d9ef.tar.gz
pyca-cryptography-2b85c4d9156ab4bd44e55b2843bd1233a7a5d9ef.tar.bz2
Simplify wycheproof pytest code (#5579)
Diffstat (limited to 'tests/conftest.py')
-rw-r--r--tests/conftest.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index 4e3124f..ece7a11 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -11,7 +11,6 @@ from cryptography.hazmat.backends.openssl import backend as openssl_backend
from .utils import (
check_backend_support,
load_wycheproof_tests,
- skip_if_wycheproof_none,
)
@@ -30,8 +29,7 @@ def pytest_addoption(parser):
def pytest_generate_tests(metafunc):
if "wycheproof" in metafunc.fixturenames:
- wycheproof = metafunc.config.getoption("--wycheproof-root")
- skip_if_wycheproof_none(wycheproof)
+ wycheproof = metafunc.config.getoption("--wycheproof-root", skip=True)
testcases = []
marker = metafunc.definition.get_closest_marker("wycheproof_tests")