Skip to content

Commit

Permalink
image-fuzzer: Use io.StringIO
Browse files Browse the repository at this point in the history
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 <ehabkost@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20191016192430.25098-5-ehabkost@redhat.com
Message-Id: <20191016192430.25098-5-ehabkost@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
  • Loading branch information
ehabkost authored and stefanhaRH committed Nov 5, 2019
1 parent d974451 commit 8353546
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions tests/image-fuzzer/runner.py
Expand Up @@ -28,7 +28,7 @@
from itertools import count
import time
import getopt
import StringIO
import io
import resource

try:
Expand Down Expand Up @@ -84,8 +84,12 @@ def handler(*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

Expand Down Expand Up @@ -183,7 +187,7 @@ def _create_backing_file(self):
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()
Expand Down Expand Up @@ -240,7 +244,7 @@ def execute(self, input_commands=None, fuzz_config=None):
"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:
Expand Down

0 comments on commit 8353546

Please sign in to comment.