[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 4/8] iotests.py: qemu_io(): reuse qemu_tool_pipe_and_status()
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v2 4/8] iotests.py: qemu_io(): reuse qemu_tool_pipe_and_status() |
Date: |
Mon, 30 Nov 2020 16:40:20 +0300 |
Just drop code duplication.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.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 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)
--
2.21.3
- [PATCH v2 for-6.0 0/8] nbd reconnect on open, Vladimir Sementsov-Ogievskiy, 2020/11/30
- [PATCH v2 4/8] iotests.py: qemu_io(): reuse qemu_tool_pipe_and_status(),
Vladimir Sementsov-Ogievskiy <=
- [PATCH v2 5/8] iotests.py: add qemu_tool_popen(), Vladimir Sementsov-Ogievskiy, 2020/11/30
- [PATCH v2 8/8] iotests: add 306 to test reconnect on nbd open, Vladimir Sementsov-Ogievskiy, 2020/11/30
- [PATCH v2 1/8] block/nbd: move initial connect to coroutine, Vladimir Sementsov-Ogievskiy, 2020/11/30
- [PATCH v2 2/8] nbd: allow reconnect on open, with corresponding new options, Vladimir Sementsov-Ogievskiy, 2020/11/30
- [PATCH v2 6/8] iotests.py: add and use qemu_io_wrap_args(), Vladimir Sementsov-Ogievskiy, 2020/11/30
- [PATCH v2 3/8] iotests.py: fix qemu_tool_pipe_and_status(), Vladimir Sementsov-Ogievskiy, 2020/11/30
- [PATCH v2 7/8] iotests.py: add qemu_io_popen(), Vladimir Sementsov-Ogievskiy, 2020/11/30