diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-04-09 10:21:14 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-04-09 10:21:14 +0100 |
| commit | 2a6bcfdebe4115993a032395d459f5e0cf27a01e (patch) | |
| tree | 2298c0c224bed283963a767934994838b51fb01b /tests/vm/basevm.py | |
| parent | 08e173f29461396575c85510eb41474b993cb1fb (diff) | |
| parent | 07fed474177a4566052ea81b1563d53a37083e84 (diff) | |
| download | focaccia-qemu-2a6bcfdebe4115993a032395d459f5e0cf27a01e.tar.gz focaccia-qemu-2a6bcfdebe4115993a032395d459f5e0cf27a01e.zip | |
Merge remote-tracking branch 'remotes/famz/tags/testing-pull-request' into staging
Testing patches # gpg: Signature made Mon 09 Apr 2018 08:18:02 BST # gpg: using RSA key CA35624C6A9171C6 # gpg: Good signature from "Fam Zheng <famz@redhat.com>" # Primary key fingerprint: 5003 7CB7 9706 0F76 F021 AD56 CA35 624C 6A91 71C6 * remotes/famz/tags/testing-pull-request: docker: fedora: test more components docker: Inline "prep_fail" in run script tests: Fix ubuntu.i386 image initialization docker: dump 'config.log' if ./configure fails Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/vm/basevm.py')
| -rwxr-xr-x | tests/vm/basevm.py | 5 |
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 |