diff options
| author | Christian Heimes <cheimes@redhat.com> | 2017-03-20 11:26:45 +0100 |
|---|---|---|
| committer | Tomas Krizek <tkrizek@redhat.com> | 2017-03-22 13:42:04 +0100 |
| commit | 2895e3931d0b4a9e20e1b211ef5a76f79fc73c9d (patch) | |
| tree | bd25440f3f1af77b63a9e47a8699375e46e9c316 /ipatests | |
| parent | dde71ec4a9669a155456a8e8912ed3a0503b8704 (diff) | |
| download | freeipa-2895e3931d0b4a9e20e1b211ef5a76f79fc73c9d.tar.gz freeipa-2895e3931d0b4a9e20e1b211ef5a76f79fc73c9d.tar.xz freeipa-2895e3931d0b4a9e20e1b211ef5a76f79fc73c9d.zip | |
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>
Diffstat (limited to 'ipatests')
| -rwxr-xr-x | ipatests/ipa-test-config | 3 | ||||
| -rwxr-xr-x | ipatests/ipa-test-task | 2 | ||||
| -rw-r--r-- | ipatests/pytest_plugins/integration/__init__.py | 2 | ||||
| -rw-r--r-- | ipatests/pytest_plugins/integration/config.py (renamed from ipatests/test_integration/config.py) | 0 | ||||
| -rw-r--r-- | ipatests/test_integration/env_config.py | 2 | ||||
| -rw-r--r-- | ipatests/test_integration/test_testconfig.py | 2 |
6 files changed, 6 insertions, 5 deletions
diff --git a/ipatests/ipa-test-config b/ipatests/ipa-test-config index cc3714fa4..a86510c04 100755 --- a/ipatests/ipa-test-config +++ b/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): diff --git a/ipatests/ipa-test-task b/ipatests/ipa-test-task index 4939d5068..1dd743e3b 100755 --- a/ipatests/ipa-test-task +++ b/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 diff --git a/ipatests/pytest_plugins/integration/__init__.py b/ipatests/pytest_plugins/integration/__init__.py index ae94dbcb1..142406dc8 100644 --- a/ipatests/pytest_plugins/integration/__init__.py +++ b/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 diff --git a/ipatests/test_integration/config.py b/ipatests/pytest_plugins/integration/config.py index 0e4ac1f1d..0e4ac1f1d 100644 --- a/ipatests/test_integration/config.py +++ b/ipatests/pytest_plugins/integration/config.py diff --git a/ipatests/test_integration/env_config.py b/ipatests/test_integration/env_config.py index 2a137c699..bd8c8d2a9 100644 --- a/ipatests/test_integration/env_config.py +++ b/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_' diff --git a/ipatests/test_integration/test_testconfig.py b/ipatests/test_integration/test_testconfig.py index 6146d0d84..c66be8c33 100644 --- a/ipatests/test_integration/test_testconfig.py +++ b/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 |