summaryrefslogtreecommitdiffstats
path: root/ipatests/pytest_plugins
diff options
context:
space:
mode:
authorOleg Fayans <ofayans@redhat.com>2016-03-21 14:08:06 +0100
committerMartin Basti <mbasti@redhat.com>2016-03-23 17:19:21 +0100
commit7289ad16cb9e33e118f146e1a798e5ed9176cde2 (patch)
treeef193aa0cd6fb68e37f94ecffc0d8b0efd38e86e /ipatests/pytest_plugins
parent03a697489af1ca6e458175b16c710b5fb6578226 (diff)
downloadfreeipa-7289ad16cb9e33e118f146e1a798e5ed9176cde2.tar.gz
freeipa-7289ad16cb9e33e118f146e1a798e5ed9176cde2.tar.xz
freeipa-7289ad16cb9e33e118f146e1a798e5ed9176cde2.zip
Reverted changes in mh fixture causing some tests to fail
Some integration tests expect the members of topology to have the testfolder. The testfolder however was created during master and client installations. In case the client is not intalled from the very beginning of the test execution, the test would complain about missing testfolder. https://fedorahosted.org/freeipa/ticket/5723 Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'ipatests/pytest_plugins')
-rw-r--r--ipatests/pytest_plugins/integration.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/ipatests/pytest_plugins/integration.py b/ipatests/pytest_plugins/integration.py
index b4002e33c..a191d8486 100644
--- a/ipatests/pytest_plugins/integration.py
+++ b/ipatests/pytest_plugins/integration.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 ipatests.test_integration import tasks
from ipatests.test_integration.config import Config
from ipatests.test_integration.env_config import get_global_config
@@ -196,6 +197,8 @@ def mh(request, class_integration_logs):
print(mh.config)
for host in mh.config.get_all_hosts():
host.add_log_collector(collect_log)
+ cls.log.info('Preparing host %s', host.hostname)
+ tasks.prepare_host(host)
setup_class(cls, mh)
mh._pytestmh_request.addfinalizer(lambda: teardown_class(cls))