From dd6b72e418eba01cc9eb9a7305291bf141b9eadf Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Fri, 17 Mar 2017 18:20:38 +0100 Subject: [PATCH] pytest 3.x compatibility pytest 3.x does no longer support plain pytest.skip() on module level. Signed-off-by: Christian Heimes Reviewed-By: Martin Basti --- ipatests/test_cmdline/__init__.py | 6 ++---- ipatests/test_install/__init__.py | 5 ++--- ipatests/test_integration/__init__.py | 5 ++--- ipatests/test_ipaserver/__init__.py | 6 ++---- ipatests/test_webui/__init__.py | 5 ++--- ipatests/test_xmlrpc/__init__.py | 5 ++--- ipatests/util.py | 16 ++++++++++++++++ 7 files changed, 28 insertions(+), 20 deletions(-) diff --git a/ipatests/test_cmdline/__init__.py b/ipatests/test_cmdline/__init__.py index af8867e5a..52eb23ef6 100644 --- a/ipatests/test_cmdline/__init__.py +++ b/ipatests/test_cmdline/__init__.py @@ -1,9 +1,7 @@ # # Copyright (C) 2015 FreeIPA Contributors see COPYING for license # - -import pytest +import ipatests.util -if pytest.config.getoption('ipaclient_unittests', False): - pytest.skip("Skip in ipaclient unittest mode") +ipatests.util.check_ipaclient_unittests() diff --git a/ipatests/test_install/__init__.py b/ipatests/test_install/__init__.py index 54ef9eb7b..1d5fd0b68 100644 --- a/ipatests/test_install/__init__.py +++ b/ipatests/test_install/__init__.py @@ -20,8 +20,7 @@ """ Package containing LDAP updates unit tests. """ -import pytest +import ipatests.util -if pytest.config.getoption('ipaclient_unittests', False): - pytest.skip("Skip in ipaclient unittest mode") +ipatests.util.check_ipaclient_unittests() diff --git a/ipatests/test_integration/__init__.py b/ipatests/test_integration/__init__.py index 8779f2f7c..2b4d5350f 100644 --- a/ipatests/test_integration/__init__.py +++ b/ipatests/test_integration/__init__.py @@ -16,8 +16,7 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . -import pytest +import ipatests.util -if pytest.config.getoption('ipaclient_unittests', False): - pytest.skip("Skip in ipaclient unittest mode") +ipatests.util.check_ipaclient_unittests() diff --git a/ipatests/test_ipaserver/__init__.py b/ipatests/test_ipaserver/__init__.py index 76942c76e..22d36eadd 100644 --- a/ipatests/test_ipaserver/__init__.py +++ b/ipatests/test_ipaserver/__init__.py @@ -20,9 +20,7 @@ """ Sub-package containing unit tests for `ipaserver` package. """ - -import pytest +import ipatests.util -if pytest.config.getoption('ipaclient_unittests', False): - pytest.skip("Skip in ipaclient unittest mode") +ipatests.util.check_ipaclient_unittests() diff --git a/ipatests/test_webui/__init__.py b/ipatests/test_webui/__init__.py index cb2f361ad..3f1b63aa8 100644 --- a/ipatests/test_webui/__init__.py +++ b/ipatests/test_webui/__init__.py @@ -20,8 +20,7 @@ """ Sub-package containing Web UI integration tests """ -import pytest +import ipatests.util -if pytest.config.getoption('ipaclient_unittests', False): - pytest.skip("Skip in ipaclient unittest mode") +ipatests.util.check_ipaclient_unittests() diff --git a/ipatests/test_xmlrpc/__init__.py b/ipatests/test_xmlrpc/__init__.py index 720c61b75..0ee42fb4f 100644 --- a/ipatests/test_xmlrpc/__init__.py +++ b/ipatests/test_xmlrpc/__init__.py @@ -20,8 +20,7 @@ """ Sub-package containing unit tests for `xmlrpc` package. """ -import pytest +import ipatests.util -if pytest.config.getoption('ipaclient_unittests', False): - pytest.skip("Skip in ipaclient unittest mode") +ipatests.util.check_ipaclient_unittests() diff --git a/ipatests/util.py b/ipatests/util.py index 4379c302d..d877dccfc 100644 --- a/ipatests/util.py +++ b/ipatests/util.py @@ -61,6 +61,22 @@ if six.PY3: unicode = str +PYTEST_VERSION = tuple(int(v) for v in pytest.__version__.split('.')) + + +def check_ipaclient_unittests(reason="Skip in ipaclient unittest mode"): + """Call this in a package to skip the package in ipaclient-unittest mode + """ + if pytest.config.getoption('ipaclient_unittests', False): + if PYTEST_VERSION[0] >= 3: + # pytest 3+ does no longer allow pytest.skip() on module level + # pylint: disable=unexpected-keyword-arg + raise pytest.skip.Exception(reason, allow_module_level=True) + # pylint: enable=unexpected-keyword-arg + else: + raise pytest.skip(reason) + + class TempDir(object): def __init__(self): self.__path = tempfile.mkdtemp(prefix='ipa.tests.')