IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

pytest 3.x compatibility

Browse Source 
pytest 3.x does no longer support plain pytest.skip() on module level.

Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Martin Basti <mbasti@redhat.com>
This commit is contained in:
Christian Heimes 2017-03-17 18:20:38 +01:00 committed by Pavel Vomacka
parent 0ba0c07813
commit dd6b72e418
7 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ipatests/test_cmdline/__init__.py
View File

@ -1,9 +1,7 @@
# #
# Copyright (C) 2015 FreeIPA Contributors see COPYING for license # Copyright (C) 2015 FreeIPA Contributors see COPYING for license
# #
import ipatests.util
import pytest
if pytest.config.getoption('ipaclient_unittests', False): ipatests.util.check_ipaclient_unittests()
pytest.skip("Skip in ipaclient unittest mode")

5
ipatests/test_install/__init__.py
View File

@ -20,8 +20,7 @@
""" """
Package containing LDAP updates unit tests. Package containing LDAP updates unit tests.
""" """
import pytest import ipatests.util
if pytest.config.getoption('ipaclient_unittests', False): ipatests.util.check_ipaclient_unittests()
pytest.skip("Skip in ipaclient unittest mode")

5
ipatests/test_integration/__init__.py
View File

@ -16,8 +16,7 @@
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import pytest import ipatests.util
if pytest.config.getoption('ipaclient_unittests', False): ipatests.util.check_ipaclient_unittests()
pytest.skip("Skip in ipaclient unittest mode")

6
ipatests/test_ipaserver/__init__.py
View File

@ -20,9 +20,7 @@
""" """
Sub-package containing unit tests for `ipaserver` package. Sub-package containing unit tests for `ipaserver` package.
""" """
import ipatests.util
import pytest
if pytest.config.getoption('ipaclient_unittests', False): ipatests.util.check_ipaclient_unittests()
pytest.skip("Skip in ipaclient unittest mode")

5
ipatests/test_webui/__init__.py
View File

@ -20,8 +20,7 @@
""" """
Sub-package containing Web UI integration tests Sub-package containing Web UI integration tests
""" """
import pytest import ipatests.util
if pytest.config.getoption('ipaclient_unittests', False): ipatests.util.check_ipaclient_unittests()
pytest.skip("Skip in ipaclient unittest mode")

5
ipatests/test_xmlrpc/__init__.py
View File

@ -20,8 +20,7 @@
""" """
Sub-package containing unit tests for `xmlrpc` package. Sub-package containing unit tests for `xmlrpc` package.
""" """
import pytest import ipatests.util
if pytest.config.getoption('ipaclient_unittests', False): ipatests.util.check_ipaclient_unittests()
pytest.skip("Skip in ipaclient unittest mode")

16
ipatests/util.py
View File

@ -61,6 +61,22 @@ if six.PY3:
unicode = str 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): class TempDir(object):
def __init__(self): def __init__(self):
self.__path = tempfile.mkdtemp(prefix='ipa.tests.') self.__path = tempfile.mkdtemp(prefix='ipa.tests.')