[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 03/11] tests: redirect stderr to stdout for iotes
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v6 03/11] tests: redirect stderr to stdout for iotests |
Date: |
Mon, 21 Mar 2016 14:11:44 +0000 |
The python I/O tests helper for running qemu-img/qemu-io
setup stdout to be captured to a pipe, but left stderr
untouched. As a result, if something failed in qemu-img/
qemu-io, data written to stderr would get output directly
and not line up with data on the test stdout due to
buffering. If we explicitly redirect stderr to the same
pipe as stdout, things are much clearer when they go
wrong.
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
---
tests/qemu-iotests/iotests.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 0a238ec..5f82bbe 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -71,7 +71,9 @@ def qemu_img_verbose(*args):
def qemu_img_pipe(*args):
'''Run qemu-img and return its output'''
- subp = subprocess.Popen(qemu_img_args + list(args), stdout=subprocess.PIPE)
+ subp = subprocess.Popen(qemu_img_args + list(args),
+ stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT)
exitcode = subp.wait()
if exitcode < 0:
sys.stderr.write('qemu-img received signal %i: %s\n' % (-exitcode, '
'.join(qemu_img_args + list(args))))
@@ -80,7 +82,8 @@ def qemu_img_pipe(*args):
def qemu_io(*args):
'''Run qemu-io and return the stdout data'''
args = qemu_io_args + list(args)
- subp = subprocess.Popen(args, stdout=subprocess.PIPE)
+ subp = subprocess.Popen(args, stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT)
exitcode = subp.wait()
if exitcode < 0:
sys.stderr.write('qemu-io received signal %i: %s\n' % (-exitcode, '
'.join(args)))
--
2.5.0
- [Qemu-devel] [PATCH v6 00/11] Add new LUKS block driver (for 2.6), Daniel P. Berrange, 2016/03/21
- [Qemu-devel] [PATCH v6 04/11] tests: refactor python I/O tests helper main method, Daniel P. Berrange, 2016/03/21
- [Qemu-devel] [PATCH v6 03/11] tests: redirect stderr to stdout for iotests,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v6 05/11] tests: add output filter to python I/O tests helper, Daniel P. Berrange, 2016/03/21
- [Qemu-devel] [PATCH v6 01/11] block: add flag to indicate that no I/O will be performed, Daniel P. Berrange, 2016/03/21
- [Qemu-devel] [PATCH v6 02/11] qemu-img/qemu-io: don't prompt for passwords if not required, Daniel P. Berrange, 2016/03/21
- [Qemu-devel] [PATCH v6 08/11] block: add support for --image-opts in block I/O tests, Daniel P. Berrange, 2016/03/21
- [Qemu-devel] [PATCH v6 06/11] block: add generic full disk encryption driver, Daniel P. Berrange, 2016/03/21
- [Qemu-devel] [PATCH v6 07/11] block: move encryption deprecation warning into qcow code, Daniel P. Berrange, 2016/03/21