[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 02/11] tests/vm: use ssh with pty unconditionally
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH v4 02/11] tests/vm: use ssh with pty unconditionally |
Date: |
Mon, 17 Jun 2019 06:38:49 +0200 |
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>
---
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 5e30bac66154..395eefaec948 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.18.1
- [Qemu-devel] [PATCH v4 00/11] tests/vm: serial console autoinstall, misc fixes., Gerd Hoffmann, 2019/06/17
- [Qemu-devel] [PATCH v4 01/11] tests/vm: send proxy environment variables over ssh, Gerd Hoffmann, 2019/06/17
- [Qemu-devel] [PATCH v4 11/11] tests/vm: ubuntu.i386: apt proxy setup, Gerd Hoffmann, 2019/06/17
- [Qemu-devel] [PATCH v4 02/11] tests/vm: use ssh with pty unconditionally,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH v4 03/11] tests/vm: run test builds on snapshot, Gerd Hoffmann, 2019/06/17
- [Qemu-devel] [PATCH v4 04/11] tests/vm: proper guest shutdown, Gerd Hoffmann, 2019/06/17
- [Qemu-devel] [PATCH v4 06/11] tests/vm: serial console support helpers, Gerd Hoffmann, 2019/06/17
- [Qemu-devel] [PATCH v4 05/11] tests/vm: add vm-boot-{ssh, serial}-<guest> targets, Gerd Hoffmann, 2019/06/17
- [Qemu-devel] [PATCH v4 10/11] tests/vm: fedora autoinstall, using serial console, Gerd Hoffmann, 2019/06/17