IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-01-26 16:16:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make conftest compatible with pytest 4.x

Browse Source 
pytest 3.6 has deprecated get_marker in 3.6. The method was removed in 4.x
and replaced with get_closest_marker.

Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Thomas Woerner <twoerner@redhat.com>
This commit is contained in:
Christian Heimes 2019-01-08 12:22:00 +01:00
parent 670bcc0113
commit e5be409245
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ipatests/conftest.py
View File

@ -131,11 +131,17 @@ def pytest_cmdline_main(config):
def pytest_runtest_setup(item):
if isinstance(item, pytest.Function):
if item.get_marker('skip_ipaclient_unittest'):
# pytest 3.6 has deprecated get_marker in 3.6. The method was
# removed in 4.x and replaced with get_closest_marker.
if hasattr(item, 'get_closest_marker'):
get_marker = item.get_closest_marker # pylint: disable=no-member
else:
get_marker = item.get_marker # pylint: disable=no-member
if get_marker('skip_ipaclient_unittest'):
# pylint: disable=no-member
if pytest.config.option.ipaclient_unittests:
pytest.skip("Skip in ipaclient unittest mode")
if item.get_marker('needs_ipaapi'):
if get_marker('needs_ipaapi'):
# pylint: disable=no-member
if pytest.config.option.skip_ipaapi:
pytest.skip("Skip tests that needs an IPA API")