[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/11] image-fuzzer: Use errors parameter of subprocess.Popen()
From: |
Stefan Hajnoczi |
Subject: |
[PULL 10/11] image-fuzzer: Use errors parameter of subprocess.Popen() |
Date: |
Tue, 5 Nov 2019 16:43:31 +0100 |
From: Eduardo Habkost <address@hidden>
Instead of manually encoding stderr and stdout output, use
`errors` parameter of subprocess.Popen(). This will make
process.communicate() return unicode strings instead of bytes
objects.
Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: John Snow <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Message-Id: <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
tests/image-fuzzer/runner.py | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/tests/image-fuzzer/runner.py b/tests/image-fuzzer/runner.py
index 0793234815..4ba5c79e13 100755
--- a/tests/image-fuzzer/runner.py
+++ b/tests/image-fuzzer/runner.py
@@ -79,16 +79,13 @@ def run_app(fd, q_args):
devnull = open('/dev/null', 'r+')
process = subprocess.Popen(q_args, stdin=devnull,
stdout=subprocess.PIPE,
- stderr=subprocess.PIPE)
+ stderr=subprocess.PIPE,
+ errors='replace')
try:
out, err = process.communicate()
signal.alarm(0)
- # fd is a text file, so we need to decode the process output before
- # writing to it.
- # We could be simply using the `errors` parameter of
subprocess.Popen(),
- # but this will be possible only after migrating to Python 3
- fd.write(out.decode(errors='replace'))
- fd.write(err.decode(errors='replace'))
+ fd.write(out)
+ fd.write(err)
fd.flush()
return process.returncode
--
2.23.0
- [PULL 00/11] Block patches, Stefan Hajnoczi, 2019/11/05
- [PULL 01/11] image-fuzzer: Open image files in binary mode, Stefan Hajnoczi, 2019/11/05
- [PULL 02/11] image-fuzzer: Write bytes instead of string to image file, Stefan Hajnoczi, 2019/11/05
- [PULL 03/11] image-fuzzer: Explicitly use integer division operator, Stefan Hajnoczi, 2019/11/05
- [PULL 04/11] image-fuzzer: Use io.StringIO, Stefan Hajnoczi, 2019/11/05
- [PULL 05/11] image-fuzzer: Use %r for all fiels at Field.__repr__(), Stefan Hajnoczi, 2019/11/05
- [PULL 06/11] image-fuzzer: Return bytes objects on string fuzzing functions, Stefan Hajnoczi, 2019/11/05
- [PULL 07/11] image-fuzzer: Use bytes constant for field values, Stefan Hajnoczi, 2019/11/05
- [PULL 08/11] image-fuzzer: Encode file name and file format to bytes, Stefan Hajnoczi, 2019/11/05
- [PULL 09/11] image-fuzzer: Run using python3, Stefan Hajnoczi, 2019/11/05
- [PULL 10/11] image-fuzzer: Use errors parameter of subprocess.Popen(),
Stefan Hajnoczi <=
- [PULL 11/11] image-fuzzer: Use OSerror.strerror instead of tuple subscript, Stefan Hajnoczi, 2019/11/05
- Re: [PULL 00/11] Block patches, Peter Maydell, 2019/11/06