summaryrefslogtreecommitdiffstats
path: root/ipatests/test_integration/base.py
diff options
context:
space:
mode:
authorPetr Viktorin <pviktori@redhat.com>2013-06-11 20:22:19 -0400
committerPetr Viktorin <pviktori@redhat.com>2013-07-15 15:49:12 +0200
commita02890526ed099f7b37684295ca67d49b4c1737b (patch)
treeba47b9e40973eb352ce2dc5abaf7fe59696cf0ca /ipatests/test_integration/base.py
parent846ae2b3f4807f2b1897811b9fe9978103c2451a (diff)
downloadfreeipa-a02890526ed099f7b37684295ca67d49b4c1737b.tar.gz
freeipa-a02890526ed099f7b37684295ca67d49b4c1737b.tar.xz
freeipa-a02890526ed099f7b37684295ca67d49b4c1737b.zip
Host class improvements
- Use the external hostname when connecting to remote hosts - Make it possible to specify working directory for remote commands - Move kinit calls to installation code This allows tests where installation is done later - Log at error level when a remote command fails unexpectedly - Clean up test directory before testing - Break infinite recursion in mkdir_recursive if dir can't be created
Diffstat (limited to 'ipatests/test_integration/base.py')
-rw-r--r--ipatests/test_integration/base.py9
1 files changed, 1 insertions, 8 deletions
diff --git a/ipatests/test_integration/base.py b/ipatests/test_integration/base.py
index 934dce056..8b243f937 100644
--- a/ipatests/test_integration/base.py
+++ b/ipatests/test_integration/base.py
@@ -62,7 +62,6 @@ class IntegrationTest(object):
try:
cls.install()
- cls.kinit_all()
except:
cls.uninstall()
raise
@@ -92,12 +91,6 @@ class IntegrationTest(object):
raise ValueError('Unknown topology %s' % cls.topology)
@classmethod
- def kinit_all(cls):
- for host in cls.get_all_hosts():
- host.run_command(['kinit', 'admin'],
- stdin_text=host.config.admin_password)
-
- @classmethod
def teardown_class(cls):
try:
cls.uninstall()
@@ -117,7 +110,7 @@ class IntegrationTest(object):
@classmethod
def collect_log(cls, host, filename):
cls.log.info('Adding %s:%s to list of logs to collect' %
- (host.hostname, filename))
+ (host.external_hostname, filename))
cls.logs_to_collect.setdefault(host, []).append(filename)
IntegrationTest.log = log_mgr.get_logger(IntegrationTest())