diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2018-09-06 22:56:46 -0500 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2018-09-06 23:56:46 -0400 |
| commit | 0322962e143798fa5228f4505eeb606cdf773b87 (patch) | |
| tree | 4cf5c56697f7e7f54d3166425cb180f8f6efe458 /tests/conftest.py | |
| parent | f88aea5d8b9452677bd23a9bba917b900cd634c0 (diff) | |
| download | cryptography-0322962e143798fa5228f4505eeb606cdf773b87.tar.gz cryptography-0322962e143798fa5228f4505eeb606cdf773b87.tar.bz2 cryptography-0322962e143798fa5228f4505eeb606cdf773b87.zip | |
update pytest config (#4463)
* update pytest config
pytest 3.8.0 was just released and officially deprecates some of the way
we do pytest marks. They introduced a new way to do this in 3.6 so this
PR switches to that mechanism and updates our minimum pytest requirement
* update the stubs
* also update wycheproof test config to remove deprecated paths
* don't need this any more
Diffstat (limited to 'tests/conftest.py')
| -rw-r--r-- | tests/conftest.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/conftest.py b/tests/conftest.py index 583c4099..d858b4f7 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -27,7 +27,8 @@ def pytest_generate_tests(metafunc): skip_if_wycheproof_none(wycheproof) testcases = [] - for path in metafunc.function.wycheproof_tests.args: + marker = metafunc.definition.get_closest_marker("wycheproof_tests") + for path in marker.args: testcases.extend(load_wycheproof_tests(wycheproof, path)) metafunc.parametrize("wycheproof", testcases) @@ -36,7 +37,7 @@ def pytest_generate_tests(metafunc): def backend(request): required_interfaces = [ mark.kwargs["interface"] - for mark in request.node.get_marker("requires_backend_interface") + for mark in request.node.iter_markers("requires_backend_interface") ] if not all( isinstance(openssl_backend, iface) for iface in required_interfaces |