On 03/22/2018 12:47 AM, Fam Zheng wrote: > 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 <[email protected]> > Signed-off-by: Fam Zheng <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]> > --- > tests/vm/basevm.py | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py > index 686d88decf..3a2d508c35 100755 > --- a/tests/vm/basevm.py > +++ b/tests/vm/basevm.py > @@ -107,10 +107,7 @@ class BaseVM(object): > assert not isinstance(cmd, str) > ssh_cmd += ["%[email protected]" % 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 >
