Fix Pytest4.1+ warnings about pytest.config

pytest.config global is deprecated since Pytest4.1:
https://docs.pytest.org/en/latest/deprecations.html#pytest-config-global
pytest-dev/pytest#3050

ipatests/conftest.py

@@ -83,6 +83,8 @@ def pytest_configure(config):
 
     # always run doc tests
     config.option.doctestmodules = True
+    # pytest.config global is deprecated
+    pytest.ipa_pytestconfig = config
 
 
 def pytest_addoption(parser):
@@ -135,11 +137,11 @@ def pytest_runtest_setup(item):
             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:
+            if item.config.option.ipaclient_unittests:
                 pytest.skip("Skip in ipaclient unittest mode")
         if get_marker('needs_ipaapi'):
             # pylint: disable=no-member
-            if pytest.config.option.skip_ipaapi:
+            if item.config.option.skip_ipaapi:
                 pytest.skip("Skip tests that needs an IPA API")
 
 

ipatests/test_util.py

@@ -152,10 +152,10 @@ def test_eq(self):
         assert (None == self.klass()) is True
 
 
-def test_assert_deepequal():
+def test_assert_deepequal(pytestconfig):
     f = util.assert_deepequal
     try:  # pylint: disable=no-member
-        pretty = pytest.config.getoption("pretty_print")
+        pretty = pytestconfig.getoption("pretty_print")
     except (AttributeError, ValueError):
         pretty = False
 

ipatests/util.py

@@ -75,7 +75,7 @@
 def check_ipaclient_unittests(reason="Skip in ipaclient unittest mode"):
     """Call this in a package to skip the package in ipaclient-unittest mode
     """
-    config = pytest.config  # pylint: disable=no-member
+    config = pytest.ipa_pytestconfig  # pylint: disable=no-member
     if config.getoption('ipaclient_unittests', False):
         if PYTEST_VERSION[0] >= 3:
             # pytest 3+ does no longer allow pytest.skip() on module level
@@ -89,7 +89,7 @@ def check_ipaclient_unittests(reason="Skip in ipaclient unittest mode"):
 def check_no_ipaapi(reason="Skip tests that needs an IPA API"):
     """Call this in a package to skip the package in no-ipaapi mode
     """
-    config = pytest.config  # pylint: disable=no-member
+    config = pytest.ipa_pytestconfig  # pylint: disable=no-member
     if config.getoption('skip_ipaapi', False):
         if PYTEST_VERSION[0] >= 3:
             # pylint: disable=unexpected-keyword-arg
@@ -389,7 +389,7 @@ def assert_deepequal(expected, got, doc='', stack=tuple()):
     their elements does not matter.
     """
     try:
-        pretty_print = pytest.config.getoption("pretty_print")
+        pretty_print = pytest.ipa_pytestconfig.getoption("pretty_print")
     except (AttributeError, ValueError):
         pretty_print = False