|
 |
47c1c9 |
From c1c1b14d359b1360e7d14a7c0687bef9ed6fc17c Mon Sep 17 00:00:00 2001
|
|
|
47c1c9 |
From: Christian Heimes <cheimes@redhat.com>
|
|
|
47c1c9 |
Date: Wed, 28 Oct 2020 14:27:55 +0100
|
|
|
47c1c9 |
Subject: [PATCH 2] Support pytest 3.4.2
|
|
|
47c1c9 |
|
|
|
47c1c9 |
---
|
|
|
47c1c9 |
setup.py | 3 ++-
|
|
|
47c1c9 |
tests/conftest.py | 4 ++--
|
|
|
47c1c9 |
tests/test_utils.py | 4 ++--
|
|
|
47c1c9 |
tests/utils.py | 2 +-
|
|
|
47c1c9 |
4 files changed, 7 insertions(+), 6 deletions(-)
|
|
|
47c1c9 |
|
|
|
47c1c9 |
diff --git a/setup.py b/setup.py
|
|
|
47c1c9 |
index 82800a96e..5678db004 100644
|
|
|
47c1c9 |
--- a/setup.py
|
|
|
47c1c9 |
+++ b/setup.py
|
|
|
47c1c9 |
@@ -93,7 +93,8 @@ setup(
|
|
|
47c1c9 |
extras_require={
|
|
|
47c1c9 |
":python_version < '3'": ["enum34", "ipaddress"],
|
|
|
47c1c9 |
"test": [
|
|
|
47c1c9 |
- "pytest>=3.6.0,!=3.9.0,!=3.9.1,!=3.9.2",
|
|
|
47c1c9 |
+ "pytest>=3.4.2,<3.6",
|
|
|
47c1c9 |
+ "attrs>=17.4.0,<18.0",
|
|
|
47c1c9 |
"pretend",
|
|
|
47c1c9 |
"iso8601",
|
|
|
47c1c9 |
"pytz",
|
|
|
47c1c9 |
diff --git a/tests/conftest.py b/tests/conftest.py
|
|
|
47c1c9 |
index 4e3124fa7..53c194830 100644
|
|
|
47c1c9 |
--- a/tests/conftest.py
|
|
|
47c1c9 |
+++ b/tests/conftest.py
|
|
|
47c1c9 |
@@ -42,7 +42,7 @@ def pytest_generate_tests(metafunc):
|
|
|
47c1c9 |
|
|
|
47c1c9 |
def pytest_runtest_setup(item):
|
|
|
47c1c9 |
if openssl_backend._fips_enabled:
|
|
|
47c1c9 |
- for marker in item.iter_markers(name="skip_fips"):
|
|
|
47c1c9 |
+ for marker in item.get_marker(name="skip_fips") or []:
|
|
|
47c1c9 |
pytest.skip(marker.kwargs["reason"])
|
|
|
47c1c9 |
|
|
|
47c1c9 |
|
|
|
47c1c9 |
@@ -50,7 +50,7 @@ def pytest_runtest_setup(item):
|
|
|
47c1c9 |
def backend(request):
|
|
|
47c1c9 |
required_interfaces = [
|
|
|
47c1c9 |
mark.kwargs["interface"]
|
|
|
47c1c9 |
- for mark in request.node.iter_markers("requires_backend_interface")
|
|
|
47c1c9 |
+ for mark in request.node.get_marker("requires_backend_interface") or []
|
|
|
47c1c9 |
]
|
|
|
47c1c9 |
if not all(
|
|
|
47c1c9 |
isinstance(openssl_backend, iface) for iface in required_interfaces
|
|
|
47c1c9 |
diff --git a/tests/test_utils.py b/tests/test_utils.py
|
|
|
47c1c9 |
index d6afa3b34..e0a1be4f5 100644
|
|
|
47c1c9 |
--- a/tests/test_utils.py
|
|
|
47c1c9 |
+++ b/tests/test_utils.py
|
|
|
47c1c9 |
@@ -43,7 +43,7 @@ def test_check_backend_support_skip():
|
|
|
47c1c9 |
supported = pretend.stub(
|
|
|
47c1c9 |
kwargs={"only_if": lambda backend: False, "skip_message": "Nope"}
|
|
|
47c1c9 |
)
|
|
|
47c1c9 |
- node = pretend.stub(iter_markers=lambda x: [supported])
|
|
|
47c1c9 |
+ node = pretend.stub(get_marker=lambda x: [supported])
|
|
|
47c1c9 |
item = pretend.stub(node=node)
|
|
|
47c1c9 |
with pytest.raises(pytest.skip.Exception) as exc_info:
|
|
|
47c1c9 |
check_backend_support(True, item)
|
|
|
47c1c9 |
@@ -54,7 +54,7 @@ def test_check_backend_support_no_skip():
|
|
|
47c1c9 |
supported = pretend.stub(
|
|
|
47c1c9 |
kwargs={"only_if": lambda backend: True, "skip_message": "Nope"}
|
|
|
47c1c9 |
)
|
|
|
47c1c9 |
- node = pretend.stub(iter_markers=lambda x: [supported])
|
|
|
47c1c9 |
+ node = pretend.stub(get_marker=lambda x: [supported])
|
|
|
47c1c9 |
item = pretend.stub(node=node)
|
|
|
47c1c9 |
assert check_backend_support(None, item) is None
|
|
|
47c1c9 |
|
|
|
47c1c9 |
diff --git a/tests/utils.py b/tests/utils.py
|
|
|
47c1c9 |
index 5d98af00e..a08f79c34 100644
|
|
|
47c1c9 |
--- a/tests/utils.py
|
|
|
47c1c9 |
+++ b/tests/utils.py
|
|
|
47c1c9 |
@@ -27,7 +27,7 @@ KeyedHashVector = collections.namedtuple(
|
|
|
47c1c9 |
|
|
|
47c1c9 |
|
|
|
47c1c9 |
def check_backend_support(backend, item):
|
|
|
47c1c9 |
- for mark in item.node.iter_markers("supported"):
|
|
|
47c1c9 |
+ for mark in item.node.get_marker("supported") or []:
|
|
|
47c1c9 |
if not mark.kwargs["only_if"](backend):
|
|
|
47c1c9 |
pytest.skip("{} ({})".format(mark.kwargs["skip_message"], backend))
|
|
|
47c1c9 |
|
|
|
47c1c9 |
--
|
|
|
47c1c9 |
2.26.2
|
|
|
47c1c9 |
|