diff options
| author | Vladimir Sementsov-Ogievskiy | 2020-11-30 14:40:20 +0100 |
|---|---|---|
| committer | Eric Blake | 2021-01-21 03:24:51 +0100 |
| commit | f874e7fa3b6583c79a74aea9e781af920ddd8091 (patch) | |
| tree | 6ee6d96f2cca617cde7427c866250bcfbc3d755f /tests/qemu-iotests | |
| parent | iotests.py: fix qemu_tool_pipe_and_status() (diff) | |
| download | qemu-f874e7fa3b6583c79a74aea9e781af920ddd8091.tar.gz qemu-f874e7fa3b6583c79a74aea9e781af920ddd8091.tar.xz qemu-f874e7fa3b6583c79a74aea9e781af920ddd8091.zip | |
iotests.py: qemu_io(): reuse qemu_tool_pipe_and_status()
Just drop code duplication.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20201130134024.19212-5-vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'tests/qemu-iotests')
| -rw-r--r-- | tests/qemu-iotests/iotests.py | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index ea5c3c5162..2e89c0ab1a 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) |