[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 04/11] image-fuzzer: Use io.StringIO
From: |
Stefan Hajnoczi |
Subject: |
[PULL 04/11] image-fuzzer: Use io.StringIO |
Date: |
Tue, 5 Nov 2019 16:43:25 +0100 |
From: Eduardo Habkost <address@hidden>
StringIO.StringIO is not available on Python 3, but io.StringIO
is available on both Python 2 and 3. io.StringIO is slightly
different from the Python 2 StringIO module, though, so we need
bytes coming from subprocess.Popen() to be explicitly decoded.
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 | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/tests/image-fuzzer/runner.py b/tests/image-fuzzer/runner.py
index 95d84f38f3..94cab5bd93 100755
--- a/tests/image-fuzzer/runner.py
+++ b/tests/image-fuzzer/runner.py
@@ -28,7 +28,7 @@ import shutil
from itertools import count
import time
import getopt
-import StringIO
+import io
import resource
try:
@@ -84,8 +84,12 @@ def run_app(fd, q_args):
try:
out, err = process.communicate()
signal.alarm(0)
- fd.write(out)
- fd.write(err)
+ # 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.flush()
return process.returncode
@@ -183,7 +187,7 @@ class TestEnv(object):
MAX_BACKING_FILE_SIZE) * (1 << 20)
cmd = self.qemu_img + ['create', '-f', backing_file_fmt,
backing_file_name, str(backing_file_size)]
- temp_log = StringIO.StringIO()
+ temp_log = io.StringIO()
retcode = run_app(temp_log, cmd)
if retcode == 0:
temp_log.close()
@@ -240,7 +244,7 @@ class TestEnv(object):
"Backing file: %s\n" \
% (self.seed, " ".join(current_cmd),
self.current_dir, backing_file_name)
- temp_log = StringIO.StringIO()
+ temp_log = io.StringIO()
try:
retcode = run_app(temp_log, current_cmd)
except OSError as e:
--
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 <=
- [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, 2019/11/05
- [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