[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 7/9] iotests.py: add and use qemu_io_wrap_args()
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v3 7/9] iotests.py: add and use qemu_io_wrap_args() |
Date: |
Mon, 6 Sep 2021 22:06:52 +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 | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index b518545c09..3b7b57489a 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -208,10 +208,17 @@ 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)
@@ -220,12 +227,7 @@ def qemu_io_log(*args):
def qemu_io_silent(*args):
'''Run qemu-io and return the exit code, suppressing stdout'''
- if '-f' in args or '--image-opts' in args:
- default_args = qemu_io_args_no_fmt
- else:
- default_args = qemu_io_args
-
- args = default_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' %
@@ -234,14 +236,14 @@ 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
class QemuIoInteractive:
def __init__(self, *args):
- self.args = qemu_io_args_no_fmt + list(args)
+ self.args = qemu_io_wrap_args(args)
# We need to keep the Popen objext around, and not
# close it immediately. Therefore, disable the pylint check:
# pylint: disable=consider-using-with
--
2.29.2
- Re: [PATCH v3 1/9] nbd/client-connection: nbd_co_establish_connection(): fix non set errp, (continued)
[PATCH v3 7/9] iotests.py: add and use qemu_io_wrap_args(),
Vladimir Sementsov-Ogievskiy <=
[PATCH v3 5/9] nbd/client-connection: improve error message of cancelled attempt, Vladimir Sementsov-Ogievskiy, 2021/09/06
[PATCH v3 6/9] iotests.py: add qemu_tool_popen(), Vladimir Sementsov-Ogievskiy, 2021/09/06
[PATCH v3 9/9] iotests: add nbd-reconnect-on-open test, Vladimir Sementsov-Ogievskiy, 2021/09/06
[PATCH v3 8/9] iotests.py: add qemu_io_popen(), Vladimir Sementsov-Ogievskiy, 2021/09/06