mirror of https://gitee.com/openkylin/qemu.git
tests: Fix ubuntu.i386 image initialization
The apt-get commands we run through ssh expect certain features of the tty, and refuses to work if /dev/null is used. It is ugly, but easy to satisfy. Actually, there is no reason to hide the output. It just makes things harder to diagnose. We can always redirect in the Makefile, so don't do it conditionally here. Reported-by: Eric Blake <eblake@redhat.com> Signed-off-by: Fam Zheng <famz@redhat.com> Message-Id: <20180322034753.6301-1-famz@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Tested-by: Eric Blake <eblake@redhat.com> Signed-off-by: Fam Zheng <famz@redhat.com>
This commit is contained in:
parent
0c153b4c6f
commit
726c9a3b8c
|
@ -107,10 +107,7 @@ def _ssh_do(self, user, cmd, check, interactive=False):
|
|||
assert not isinstance(cmd, str)
|
||||
ssh_cmd += ["%s@127.0.0.1" % user] + list(cmd)
|
||||
logging.debug("ssh_cmd: %s", " ".join(ssh_cmd))
|
||||
r = subprocess.call(ssh_cmd,
|
||||
stdin=sys.stdin if interactive else self._devnull,
|
||||
stdout=sys.stdout if interactive else self._stdout,
|
||||
stderr=sys.stderr if interactive else self._stderr)
|
||||
r = subprocess.call(ssh_cmd)
|
||||
if check and r != 0:
|
||||
raise Exception("SSH command failed: %s" % cmd)
|
||||
return r
|
||||
|
|
Loading…
Reference in New Issue