From 7b5124416b193ce026ff30f1968e00d8c800d881 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Tue, 14 Jan 2014 17:16:12 +0100 Subject: integration tests OpenSSHTransport: Expand tilde to home in root_ssh_key_filename Expand paths beginning with a tilde, such as the default ~/.ssh/id_rsa, to the home directory. https://fedorahosted.org/freeipa/ticket/4115 --- ipatests/test_integration/transport.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ipatests/test_integration/transport.py b/ipatests/test_integration/transport.py index 85c022221..066feaef6 100644 --- a/ipatests/test_integration/transport.py +++ b/ipatests/test_integration/transport.py @@ -284,7 +284,8 @@ class OpenSSHTransport(Transport): '-o', 'UserKnownHostsFile=%s' % known_hosts_file] if self.host.root_ssh_key_filename: - argv.extend(['-i', self.host.root_ssh_key_filename]) + key_filename = os.path.expanduser(self.host.root_ssh_key_filename) + argv.extend(['-i', key_filename]) elif self.host.root_password: self.log.critical('Password authentication not supported') raise RuntimeError('Password authentication not supported') -- cgit