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/test_utils.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/test_utils.py')
| -rw-r--r-- | tests/test_utils.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/test_utils.py b/tests/test_utils.py index 181d9833..81656eb9 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -32,7 +32,8 @@ def test_check_backend_support_skip(): supported = pretend.stub( kwargs={"only_if": lambda backend: False, "skip_message": "Nope"} ) - item = pretend.stub(keywords={"supported": [supported]}) + node = pretend.stub(iter_markers=lambda x: [supported]) + item = pretend.stub(node=node) with pytest.raises(pytest.skip.Exception) as exc_info: check_backend_support(True, item) assert exc_info.value.args[0] == "Nope (True)" @@ -42,7 +43,8 @@ def test_check_backend_support_no_skip(): supported = pretend.stub( kwargs={"only_if": lambda backend: True, "skip_message": "Nope"} ) - item = pretend.stub(keywords={"supported": [supported]}) + node = pretend.stub(iter_markers=lambda x: [supported]) + item = pretend.stub(node=node) assert check_backend_support(None, item) is None |