On 11/30/20 7:40 AM, Vladimir Sementsov-Ogievskiy wrote: > Just drop code duplication. > > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com> > --- > tests/qemu-iotests/iotests.py | 9 +-------- > 1 file changed, 1 insertion(+), 8 deletions(-)
Reviewed-by: Eric Blake <ebl...@redhat.com> > > diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py > index 5ebe25e063..6c9bcf9042 100644 > --- a/tests/qemu-iotests/iotests.py > +++ b/tests/qemu-iotests/iotests.py > @@ -188,14 +188,7 @@ def img_info_log(filename, filter_path=None, > imgopts=False, extra_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, > - stderr=subprocess.STDOUT, > - universal_newlines=True) > - output = subp.communicate()[0] > - if subp.returncode < 0: > - sys.stderr.write('qemu-io received signal %i: %s\n' > - % (-subp.returncode, ' '.join(args))) > - return output > + return qemu_tool_pipe_and_status('qemu-io', args)[0] > > def qemu_io_log(*args): > result = qemu_io(*args) > -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org