aboutsummaryrefslogtreecommitdiffstats
path: root/tests/utils.py
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2018-09-06 22:56:46 -0500
committerAlex Gaynor <alex.gaynor@gmail.com>2018-09-06 23:56:46 -0400
commit0322962e143798fa5228f4505eeb606cdf773b87 (patch)
tree4cf5c56697f7e7f54d3166425cb180f8f6efe458 /tests/utils.py
parentf88aea5d8b9452677bd23a9bba917b900cd634c0 (diff)
downloadcryptography-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/utils.py')
-rw-r--r--tests/utils.py12
1 files changed, 5 insertions, 7 deletions
diff --git a/tests/utils.py b/tests/utils.py
index b950f8bd..af7f766c 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -28,13 +28,11 @@ KeyedHashVector = collections.namedtuple(
def check_backend_support(backend, item):
- supported = item.keywords.get("supported")
- if supported:
- for mark in supported:
- if not mark.kwargs["only_if"](backend):
- pytest.skip("{0} ({1})".format(
- mark.kwargs["skip_message"], backend
- ))
+ for mark in item.node.iter_markers("supported"):
+ if not mark.kwargs["only_if"](backend):
+ pytest.skip("{0} ({1})".format(
+ mark.kwargs["skip_message"], backend
+ ))
@contextmanager