Move config module to ipatests.pytest_plugins.integration.config

https://pagure.io/freeipa/issue/6798
Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Milan Kubik <mkubik@redhat.com>

ipatests/ipa-test-config

@@ -27,7 +27,8 @@ import argparse
 import json
 
 from ipalib.constants import FQDN
-from ipatests.test_integration import config, env_config
+from ipatests.test_integration import env_config
+from ipatests.pytest_plugins.integration import config
 
 
 def main(argv):

ipatests/ipa-test-task

@@ -26,7 +26,7 @@ import os
 import argparse
 
 from ipapython.ipa_log_manager import log_mgr, standard_logging_setup
-from ipatests.test_integration import config
+from ipatests.pytest_plugins.integration import config
 from ipatests.test_integration import tasks
 from ipatests.test_integration.host import Host
 from ipatests.pytest_plugins.integration import collect_logs

ipatests/pytest_plugins/integration/__init__.py

@@ -30,6 +30,7 @@ from pytest_multihost import make_multihost_fixture
 
 from ipapython import ipautil
 from ipapython.ipa_log_manager import log_mgr
+from .config import Config
 
 log = log_mgr.get_logger(__name__)
 
@@ -154,7 +155,6 @@ def mh(request, class_integration_logs):
     """
     # TODO: cleanup modules
     from ipatests.test_integration import tasks
-    from ipatests.test_integration.config import Config
     from ipatests.test_integration.env_config import get_global_config
 
     cls = request.cls

ipatests/test_integration/env_config.py

@@ -31,7 +31,7 @@ import collections
 import six
 
 from ipapython import ipautil
-from ipatests.test_integration.config import Config, Domain
+from ipatests.pytest_plugins.integration.config import Config, Domain
 from ipalib.constants import MAX_DOMAIN_LEVEL
 
 TESTHOST_PREFIX = 'TESTHOST_'

ipatests/test_integration/test_testconfig.py

@@ -20,7 +20,7 @@
 import json
 import copy
 
-from ipatests.test_integration import config
+from ipatests.pytest_plugins.integration import config
 from ipapython.ipautil import write_tmp_file
 from ipatests.util import assert_deepequal
 from ipalib.constants import MAX_DOMAIN_LEVEL