Hi, The RHEL 5.9 clients do not have /usr/bin symlinks.
Part of: https://fedorahosted.org/freeipa/ticket/3833 -- Tomas Babej Associate Software Engeneer | Red Hat | Identity Management RHCE | Brno Site | IRC: tbabej | freeipa.org
From 9b10658d19d29f6d0d2a9237c1e0062fff471b04 Mon Sep 17 00:00:00 2001 From: Tomas Babej <[email protected]> Date: Wed, 30 Oct 2013 10:03:49 +0100 Subject: [PATCH] ipatests: Do not use /usr/bin hardcoded paths Part of: https://fedorahosted.org/freeipa/ticket/3833 --- ipatests/test_integration/transport.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ipatests/test_integration/transport.py b/ipatests/test_integration/transport.py index a0bd3700ac4e9887804f021d1a2fb4eb050457d3..8894e0ae2f37f75c5495b43dd3d26f4790ed5b39 100644 --- a/ipatests/test_integration/transport.py +++ b/ipatests/test_integration/transport.py @@ -277,7 +277,7 @@ class OpenSSHTransport(Transport): control_file = os.path.join(self.control_dir.path, 'control') known_hosts_file = os.path.join(self.control_dir.path, 'known_hosts') - argv = ['/usr/bin/ssh', + argv = ['ssh', '-l', 'root', '-o', 'ControlPath=%s' % control_file, '-o', 'StrictHostKeyChecking=no', @@ -299,7 +299,7 @@ class OpenSSHTransport(Transport): def start_shell(self, argv, log_stdout=True): self.log.info('RUN %s', argv) - command = self._run(['/bin/bash'], argv=argv, log_stdout=log_stdout) + command = self._run(['bash'], argv=argv, log_stdout=log_stdout) return command def _run(self, command, log_stdout=True, argv=None, collect_output=True): @@ -319,25 +319,26 @@ class OpenSSHTransport(Transport): def file_exists(self, path): self.log.info('STAT %s', path) - cmd = self._run(['/usr/bin/ls', path], log_stdout=False) + cmd = self._run(['ls', path], log_stdout=False) cmd.wait(raiseonerr=False) + return cmd.returncode == 0 def mkdir(self, path): self.log.info('MKDIR %s', path) - cmd = self._run(['/usr/bin/mkdir', path]) + cmd = self._run(['mkdir', path]) cmd.wait() def put_file_contents(self, filename, contents): self.log.info('PUT %s', filename) - cmd = self._run(['/usr/bin/tee', filename], log_stdout=False) + cmd = self._run(['tee', filename], log_stdout=False) cmd.stdin.write(contents) cmd.wait() assert cmd.stdout_text == contents def get_file_contents(self, filename): self.log.info('GET %s', filename) - cmd = self._run(['/usr/bin/cat', filename], log_stdout=False) + cmd = self._run(['cat', filename], log_stdout=False) cmd.wait(raiseonerr=False) if cmd.returncode == 0: return cmd.stdout_text -- 1.8.3.1
_______________________________________________ Freeipa-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/freeipa-devel
