[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 6/8] iotests.py: add and use qemu_io_wrap_args()
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v2 6/8] iotests.py: add and use qemu_io_wrap_args() |
Date: |
Mon, 30 Nov 2020 16:40:22 +0300 |
For qemu_io* functions support --image-opts argument, which conflicts
with -f argument from qemu_io_args.
For QemuIoInteractive use new wrapper as well, which allows relying on
default format.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
tests/qemu-iotests/iotests.py | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index df9834e43a..393028eb9a 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -190,10 +190,15 @@ def img_info_log(filename, filter_path=None,
imgopts=False, extra_args=()):
filter_path = filename
log(filter_img_info(output, filter_path))
+def qemu_io_wrap_args(args: Sequence[str]):
+ if '-f' in args or '--image-opts' in args:
+ return qemu_io_args_no_fmt + list(args)
+ else:
+ return qemu_io_args + list(args)
+
def qemu_io(*args):
'''Run qemu-io and return the stdout data'''
- args = qemu_io_args + list(args)
- return qemu_tool_pipe_and_status('qemu-io', args)[0]
+ return qemu_tool_pipe_and_status('qemu-io', qemu_io_wrap_args(args))[0]
def qemu_io_log(*args):
result = qemu_io(*args)
@@ -202,7 +207,7 @@ def qemu_io_log(*args):
def qemu_io_silent(*args):
'''Run qemu-io and return the exit code, suppressing stdout'''
- args = qemu_io_args + list(args)
+ args = qemu_io_wrap_args(args)
exitcode = subprocess.call(args, stdout=open('/dev/null', 'w'))
if exitcode < 0:
sys.stderr.write('qemu-io received signal %i: %s\n' %
@@ -211,7 +216,7 @@ def qemu_io_silent(*args):
def qemu_io_silent_check(*args):
'''Run qemu-io and return the true if subprocess returned 0'''
- args = qemu_io_args + list(args)
+ args = qemu_io_wrap_args(args)
exitcode = subprocess.call(args, stdout=open('/dev/null', 'w'),
stderr=subprocess.STDOUT)
return exitcode == 0
@@ -223,7 +228,7 @@ def get_virtio_scsi_device():
class QemuIoInteractive:
def __init__(self, *args):
- self.args = qemu_io_args_no_fmt + list(args)
+ self.args = qemu_io_wrap_args(args)
self._p = subprocess.Popen(self.args, stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
--
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, 2020/11/30
- [PATCH v2 5/8] iotests.py: add qemu_tool_popen(), 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 8/8] iotests: add 306 to test reconnect on nbd open, 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 6/8] iotests.py: add and use qemu_io_wrap_args(),
Vladimir Sementsov-Ogievskiy <=
- [PATCH v2 2/8] nbd: allow reconnect on open, with corresponding new options, Vladimir Sementsov-Ogievskiy, 2020/11/30
- [PATCH v2 7/8] iotests.py: add qemu_io_popen(), Vladimir Sementsov-Ogievskiy, 2020/11/30