aboutsummaryrefslogtreecommitdiff
path: root/tests/vm
diff options
context:
space:
mode:
authorFam Zheng <famz@redhat.com>2018-03-22 11:47:53 +0800
committerFam Zheng <famz@redhat.com>2018-04-09 15:13:02 +0800
commit726c9a3b8c55d064527c1dff8276f6e44ce76933 (patch)
treee8a49a9396deebc0da5015c2ed02ef921031effe /tests/vm
parent0c153b4c6fb4442584a7ed95a9aaced6c08ee07e (diff)
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>
Diffstat (limited to 'tests/vm')
-rwxr-xr-xtests/vm/basevm.py5
1 files changed, 1 insertions, 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 += ["%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