[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/13] iotests.py: qemu_io(): reuse qemu_tool_pipe_and_status()
From: |
Eric Blake |
Subject: |
[PULL 13/13] iotests.py: qemu_io(): reuse qemu_tool_pipe_and_status() |
Date: |
Wed, 20 Jan 2021 20:36:57 -0600 |
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
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>
---
tests/qemu-iotests/iotests.py | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index ea5c3c51624e..2e89c0ab1abc 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)
--
2.30.0
- [PULL 01/13] qemu-nbd: Fix a memleak in qemu_nbd_client_list(), (continued)
- [PULL 01/13] qemu-nbd: Fix a memleak in qemu_nbd_client_list(), Eric Blake, 2021/01/20
- [PULL 02/13] qemu-nbd: Fix a memleak in nbd_client_thread(), Eric Blake, 2021/01/20
- [PULL 04/13] nbd/server: Quiesce coroutines on context switch, Eric Blake, 2021/01/20
- [PULL 05/13] iotests/277: use dot slash for nbd-fault-injector.py running, Eric Blake, 2021/01/20
- [PULL 03/13] block: Honor blk_set_aio_context() context requirements, Eric Blake, 2021/01/20
- [PULL 07/13] iotests: fix some whitespaces in test output files, Eric Blake, 2021/01/20
- [PULL 08/13] iotests: make tests executable, Eric Blake, 2021/01/20
- [PULL 10/13] iotests: define group in each iotest, Eric Blake, 2021/01/20
- [PULL 11/13] iotests/264: fix style, Eric Blake, 2021/01/20
- [PULL 13/13] iotests.py: qemu_io(): reuse qemu_tool_pipe_and_status(),
Eric Blake <=
- [PULL 06/13] iotests/303: use dot slash for qcow2.py running, Eric Blake, 2021/01/20
- [PULL 09/13] iotests/294: add shebang line, Eric Blake, 2021/01/20
- [PULL 12/13] iotests.py: fix qemu_tool_pipe_and_status(), Eric Blake, 2021/01/20
- Re: [PULL 00/13] NBD patches through 2021-01-20, Peter Maydell, 2021/01/21