diff options
author | Gerd Hoffmann <kraxel@redhat.com> | 2019-06-17 06:38:49 +0200 |
---|---|---|
committer | Alex Bennée <alex.bennee@linaro.org> | 2019-07-04 19:22:58 +0100 |
commit | 796471e9756982f534c3fe1444a42a021d3d21d4 (patch) | |
tree | 590de466d882a6ee483e2c1cdbdf3c184f8847ef /tests/vm/basevm.py | |
parent | b08ba163aaae37003e515376d760b282a0111213 (diff) |
tests/vm: use ssh with pty unconditionally
Allways ask ssh to run with a pseudo terminal.
Not having a terminal causes problems now and then.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Tested-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190617043858.8290-3-kraxel@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Diffstat (limited to 'tests/vm/basevm.py')
-rwxr-xr-x | tests/vm/basevm.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 75af3fbe6c..ceecc351f5 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -108,16 +108,14 @@ class BaseVM(object): os.rename(fname + ".download", fname) return fname - def _ssh_do(self, user, cmd, check, interactive=False): - ssh_cmd = ["ssh", "-q", + def _ssh_do(self, user, cmd, check): + ssh_cmd = ["ssh", "-q", "-t", "-o", "StrictHostKeyChecking=no", "-o", "UserKnownHostsFile=" + os.devnull, "-o", "ConnectTimeout=1", "-p", self.ssh_port, "-i", self._ssh_key_file] for var in self.envvars: ssh_cmd += ['-o', "SendEnv=%s" % var ] - if interactive: - ssh_cmd += ['-t'] assert not isinstance(cmd, str) ssh_cmd += ["%s@127.0.0.1" % user] + list(cmd) logging.debug("ssh_cmd: %s", " ".join(ssh_cmd)) @@ -129,9 +127,6 @@ class BaseVM(object): def ssh(self, *cmd): return self._ssh_do(self.GUEST_USER, cmd, False) - def ssh_interactive(self, *cmd): - return self._ssh_do(self.GUEST_USER, cmd, False, True) - def ssh_root(self, *cmd): return self._ssh_do("root", cmd, False) @@ -285,9 +280,9 @@ def main(vmcls): return 2 if args.interactive: - if vm.ssh_interactive(*cmd) == 0: + if vm.ssh(*cmd) == 0: return 0 - vm.ssh_interactive() + vm.ssh() return 3 else: if vm.ssh(*cmd) != 0: |