[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 06/17] tests/vm: use ssh with pty unconditionally
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH v1 06/17] tests/vm: use ssh with pty unconditionally |
Date: |
Wed, 19 Jun 2019 20:40:10 +0100 |
From: Gerd Hoffmann <address@hidden>
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>
Message-Id: <address@hidden>
[AJB: added PMD's r-b/t-b tags]
Signed-off-by: Alex Bennée <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 5e30bac661..395eefaec9 100755
--- a/tests/vm/basevm.py
+++ b/tests/vm/basevm.py
@@ -107,16 +107,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))
@@ -128,9 +126,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)
@@ -284,9 +279,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:
--
2.20.1
- [Qemu-devel] [PATCH v1 02/17] tests/vm: avoid image presence check and removal, (continued)
- [Qemu-devel] [PATCH v1 02/17] tests/vm: avoid image presence check and removal, Alex Bennée, 2019/06/19
- [Qemu-devel] [PATCH v1 03/17] tests/vm: pin ubuntu.i386 image, Alex Bennée, 2019/06/19
- [Qemu-devel] [PATCH v1 08/17] tests/vm: proper guest shutdown, Alex Bennée, 2019/06/19
- [Qemu-devel] [PATCH v1 10/17] tests/vm: serial console support helpers, Alex Bennée, 2019/06/19
- [Qemu-devel] [PATCH v1 14/17] tests/vm: fedora autoinstall, using serial console, Alex Bennée, 2019/06/19
- [Qemu-devel] [PATCH v1 07/17] tests/vm: run test builds on snapshot, Alex Bennée, 2019/06/19
- [Qemu-devel] [PATCH v1 06/17] tests/vm: use ssh with pty unconditionally,
Alex Bennée <=
- [Qemu-devel] [PATCH v1 05/17] tests/vm: send proxy environment variables over ssh, Alex Bennée, 2019/06/19
- [Qemu-devel] [PATCH v1 09/17] tests/vm: add vm-boot-{ssh, serial}-<guest> targets, Alex Bennée, 2019/06/19
- [Qemu-devel] [PATCH v1 17/17] .travis.yml: force a brew update for MacOS builds, Alex Bennée, 2019/06/19
- [Qemu-devel] [PATCH v1 13/17] tests/vm: netbsd autoinstall, using serial console, Alex Bennée, 2019/06/19
- [Qemu-devel] [PATCH v1 15/17] tests/vm: ubuntu.i386: apt proxy setup, Alex Bennée, 2019/06/19
- [Qemu-devel] [PATCH v1 12/17] tests/vm: freebsd autoinstall, using serial console, Alex Bennée, 2019/06/19