From a02890526ed099f7b37684295ca67d49b4c1737b Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Tue, 11 Jun 2013 20:22:19 -0400 Subject: 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 --- ipatests/test_integration/base.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'ipatests/test_integration/base.py') diff --git a/ipatests/test_integration/base.py b/ipatests/test_integration/base.py index 934dce05..8b243f93 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 @@ -91,12 +90,6 @@ class IntegrationTest(object): else: 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: @@ -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()) -- cgit