[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3 04/14] tests/vm: use ssh with pty uncondition
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [Qemu-devel] [PATCH v3 04/14] tests/vm: use ssh with pty unconditionally |
Date: |
Mon, 20 May 2019 20:03:07 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 |
On 5/20/19 2:47 PM, Gerd Hoffmann wrote:
> Allways ask ssh to run with a pseudo terminal.
> Not having a terminal causes problems now and then.
>
> Signed-off-by: Gerd Hoffmann <address@hidden>
> Tested-by: Thomas Huth <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
> ---
> tests/vm/basevm.py | 13 ++++---------
> 1 file changed, 4 insertions(+), 9 deletions(-)
>
> diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
> index 640f3226929d..878f1a7a32b8 100755
> --- a/tests/vm/basevm.py
> +++ b/tests/vm/basevm.py
> @@ -106,16 +106,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 += ["address@hidden" % user] + list(cmd)
> logging.debug("ssh_cmd: %s", " ".join(ssh_cmd))
> @@ -127,9 +125,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)
>
> @@ -283,9 +278,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:
>
- [Qemu-devel] [PATCH v3 00/14] tests/vm: serial console autoinstall, misc fixes., Gerd Hoffmann, 2019/05/20
- [Qemu-devel] [PATCH v3 03/14] tests/vm: send proxy environment variables over ssh, Gerd Hoffmann, 2019/05/20
- [Qemu-devel] [PATCH v3 08/14] tests/vm: add DEBUG=1 to help text, Gerd Hoffmann, 2019/05/20
- [Qemu-devel] [PATCH v3 05/14] tests/vm: run test builds on snapshot, Gerd Hoffmann, 2019/05/20
- [Qemu-devel] [PATCH v3 09/14] tests/vm: serial console support helpers, Gerd Hoffmann, 2019/05/20
- [Qemu-devel] [PATCH v3 04/14] tests/vm: use ssh with pty unconditionally, Gerd Hoffmann, 2019/05/20
- Re: [Qemu-devel] [PATCH v3 04/14] tests/vm: use ssh with pty unconditionally,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v3 01/14] scripts: use git archive in archive-source, Gerd Hoffmann, 2019/05/20
- [Qemu-devel] [PATCH v3 14/14] tests/vm: ubuntu.i386: apt proxy setup, Gerd Hoffmann, 2019/05/20
- [Qemu-devel] [PATCH v3 07/14] tests/vm: add vm-boot-{ssh, serial}-<guest> targets, Gerd Hoffmann, 2019/05/20
- [Qemu-devel] [PATCH v3 06/14] tests/vm: proper guest shutdown, Gerd Hoffmann, 2019/05/20
- [Qemu-devel] [PATCH v3 02/14] tests/vm: python3 fixes, Gerd Hoffmann, 2019/05/20
- [Qemu-devel] [PATCH v3 11/14] tests/vm: freebsd autoinstall, using serial console, Gerd Hoffmann, 2019/05/20