diff options
| author | Christian Heimes <cheimes@redhat.com> | 2017-03-20 11:36:24 +0100 |
|---|---|---|
| committer | Tomas Krizek <tkrizek@redhat.com> | 2017-03-22 13:42:04 +0100 |
| commit | 8867412adc0ffd0cacf555a5c3693e04074fed5b (patch) | |
| tree | 607720cae7c57563d3e2b780596dbd6677ae0dd1 /ipatests | |
| parent | 313ae46b573b4cac1075dc1b5bd7294424fabfdb (diff) | |
| download | freeipa-8867412adc0ffd0cacf555a5c3693e04074fed5b.tar.gz freeipa-8867412adc0ffd0cacf555a5c3693e04074fed5b.tar.xz freeipa-8867412adc0ffd0cacf555a5c3693e04074fed5b.zip | |
Move hosts module to ipatests.pytest_plugins.integration.hosts
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-task | 2 | ||||
| -rw-r--r-- | ipatests/pytest_plugins/integration/config.py | 2 | ||||
| -rw-r--r-- | ipatests/pytest_plugins/integration/host.py (renamed from ipatests/test_integration/host.py) | 0 | ||||
| -rw-r--r-- | ipatests/pytest_plugins/integration/tasks.py | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/ipatests/ipa-test-task b/ipatests/ipa-test-task index d1b0611f2..419c47c80 100755 --- a/ipatests/ipa-test-task +++ b/ipatests/ipa-test-task @@ -28,7 +28,7 @@ import argparse from ipapython.ipa_log_manager import log_mgr, standard_logging_setup from ipatests.pytest_plugins.integration import config from ipatests.pytest_plugins.integration import tasks -from ipatests.test_integration.host import Host +from ipatests.pytest_plugins.integration.host import Host from ipatests.pytest_plugins.integration import collect_logs try: diff --git a/ipatests/pytest_plugins/integration/config.py b/ipatests/pytest_plugins/integration/config.py index 94c833d8e..3d026e340 100644 --- a/ipatests/pytest_plugins/integration/config.py +++ b/ipatests/pytest_plugins/integration/config.py @@ -120,7 +120,7 @@ class Domain(pytest_multihost.config.Domain): raise LookupError(self.type) def get_host_class(self, host_dict): - from ipatests.test_integration.host import Host, WinHost + from ipatests.pytest_plugins.integration.host import Host, WinHost if self.type == 'IPA': return Host diff --git a/ipatests/test_integration/host.py b/ipatests/pytest_plugins/integration/host.py index 45a2ea286..45a2ea286 100644 --- a/ipatests/test_integration/host.py +++ b/ipatests/pytest_plugins/integration/host.py diff --git a/ipatests/pytest_plugins/integration/tasks.py b/ipatests/pytest_plugins/integration/tasks.py index f92ab5e02..d95354924 100644 --- a/ipatests/pytest_plugins/integration/tasks.py +++ b/ipatests/pytest_plugins/integration/tasks.py @@ -38,7 +38,7 @@ from ipapython.dn import DN from ipapython.ipa_log_manager import log_mgr from ipatests.test_integration import util from ipatests.pytest_plugins.integration.env_config import env_to_script -from ipatests.test_integration.host import Host +from ipatests.pytest_plugins.integration.host import Host from ipalib import errors from ipalib.util import get_reverse_zone_default, verify_host_resolvable from ipalib.constants import DOMAIN_SUFFIX_NAME |