diff options
author | Petr Viktorin <pviktori@redhat.com> | 2014-11-13 16:23:56 +0100 |
---|---|---|
committer | Tomas Babej <tbabej@redhat.com> | 2014-12-11 07:04:58 +0100 |
commit | 74f7d67fd5484137b77e54ab50d7869daa6a7db5 (patch) | |
tree | 976d9c22b7f0587135acdbb4418fec0155160c04 /ipatests/test_integration/base.py | |
parent | 8822be36d342c2bc499937c3f144e11ae98d8e58 (diff) | |
download | freeipa-74f7d67fd5484137b77e54ab50d7869daa6a7db5.tar.gz freeipa-74f7d67fd5484137b77e54ab50d7869daa6a7db5.tar.xz freeipa-74f7d67fd5484137b77e54ab50d7869daa6a7db5.zip |
test_integration: Use python-pytest-multihost
The core integration testing functionality was split into a separate
project. Use this project, and configure it for FreeIPA.
The "mh" (multihost) fixture is made available for integration tests.
Configuration based on environment variables is moved into a separate
module, to ease eventual deprecation.
Reviewed-By: Tomas Babej <tbabej@redhat.com>
Diffstat (limited to 'ipatests/test_integration/base.py')
-rw-r--r-- | ipatests/test_integration/base.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/ipatests/test_integration/base.py b/ipatests/test_integration/base.py index c8b98126e..d291c36c2 100644 --- a/ipatests/test_integration/base.py +++ b/ipatests/test_integration/base.py @@ -29,7 +29,7 @@ log = log_mgr.get_logger(__name__) @ordered -@pytest.mark.usefixtures('integration_config') +@pytest.mark.usefixtures('mh') @pytest.mark.usefixtures('integration_logs') class IntegrationTest(object): num_replicas = 0 @@ -61,12 +61,7 @@ class IntegrationTest(object): return [cls.domain] + cls.ad_domains @classmethod - def prepare_host(cls, host): - cls.log.info('Preparing host %s', host.hostname) - tasks.prepare_host(host) - - @classmethod - def install(cls): + def install(cls, mh): if cls.topology is None: return else: @@ -77,7 +72,7 @@ class IntegrationTest(object): pass @classmethod - def uninstall(cls): + def uninstall(cls, mh): tasks.uninstall_master(cls.master) for replica in cls.replicas: tasks.uninstall_master(replica) |