summaryrefslogtreecommitdiffstats
path: root/ipatests/test_integration/base.py
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2013-06-27 10:44:02 +0200
committerPetr Viktorin <pviktori@redhat.com>2013-07-25 12:32:34 +0200
commitac70c2cc5cf6434045dcb8c7f54b4b0b59873c47 (patch)
treebd28c5db08faf22d4f447f8e11e1fd3677e8dca3 /ipatests/test_integration/base.py
parentdb8027407a1ef021d23ca0e8b38609a0a1805c08 (diff)
downloadfreeipa-ac70c2cc5cf6434045dcb8c7f54b4b0b59873c47.tar.gz
freeipa-ac70c2cc5cf6434045dcb8c7f54b4b0b59873c47.tar.xz
freeipa-ac70c2cc5cf6434045dcb8c7f54b4b0b59873c47.zip
Add more test tasks
- install_client - connect_replica - disconnect_replica - prepare_host - kinit_admin
Diffstat (limited to 'ipatests/test_integration/base.py')
-rw-r--r--ipatests/test_integration/base.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/ipatests/test_integration/base.py b/ipatests/test_integration/base.py
index 4e8521dd9..86acbcce1 100644
--- a/ipatests/test_integration/base.py
+++ b/ipatests/test_integration/base.py
@@ -24,7 +24,7 @@ import os
import nose
from ipapython.ipa_log_manager import log_mgr
-from ipatests.test_integration.config import get_global_config, env_to_script
+from ipatests.test_integration.config import get_global_config
from ipatests.test_integration import tasks
from ipatests.order_plugin import ordered
@@ -74,10 +74,7 @@ class IntegrationTest(object):
@classmethod
def prepare_host(cls, host):
cls.log.info('Preparing host %s', host.hostname)
- env_filename = os.path.join(host.config.test_dir, 'env.sh')
- cls.collect_log(host, env_filename)
- host.mkdir_recursive(host.config.test_dir)
- host.put_file_contents(env_filename, env_to_script(host.to_env()))
+ tasks.prepare_host(host)
@classmethod
def install(cls):