[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 01/17] iotests.py: img_info_log(): rename imgopts argument
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v3 01/17] iotests.py: img_info_log(): rename imgopts argument |
Date: |
Tue, 14 Sep 2021 13:25:31 +0300 |
We are going to support IMGOPTS environment variable like in bash
tests. Corresponding global variable in iotests.py should be called
imgopts. So to not interfere with function argument, rename it in
advance.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/210 | 8 ++++----
tests/qemu-iotests/iotests.py | 5 +++--
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/tests/qemu-iotests/210 b/tests/qemu-iotests/210
index 5a62ed4dd1..79b4967225 100755
--- a/tests/qemu-iotests/210
+++ b/tests/qemu-iotests/210
@@ -62,7 +62,7 @@ with iotests.FilePath('t.luks') as disk_path, \
'driver=luks,file.driver=file,file.filename=%s,key-secret=keysec0' %
(disk_path),
filter_path=disk_path,
extra_args=['--object', 'secret,id=keysec0,data=foo'],
- imgopts=True)
+ use_image_opts=True)
#
# Successful image creation (with non-default options)
@@ -96,7 +96,7 @@ with iotests.FilePath('t.luks') as disk_path, \
'driver=luks,file.driver=file,file.filename=%s,key-secret=keysec0' %
(disk_path),
filter_path=disk_path,
extra_args=['--object', 'secret,id=keysec0,data=foo'],
- imgopts=True)
+ use_image_opts=True)
#
# Invalid BlockdevRef
@@ -132,7 +132,7 @@ with iotests.FilePath('t.luks') as disk_path, \
'driver=luks,file.driver=file,file.filename=%s,key-secret=keysec0' %
(disk_path),
filter_path=disk_path,
extra_args=['--object', 'secret,id=keysec0,data=foo'],
- imgopts=True)
+ use_image_opts=True)
#
# Invalid sizes
@@ -176,4 +176,4 @@ with iotests.FilePath('t.luks') as disk_path, \
'driver=luks,file.driver=file,file.filename=%s,key-secret=keysec0' %
(disk_path),
filter_path=disk_path,
extra_args=['--object', 'secret,id=keysec0,data=foo'],
- imgopts=True)
+ use_image_opts=True)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 11276f380a..782d4f0e21 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -205,9 +205,10 @@ def qemu_img_log(*args):
log(result, filters=[filter_testfiles])
return result
-def img_info_log(filename, filter_path=None, imgopts=False, extra_args=()):
+def img_info_log(filename, filter_path=None, use_image_opts=False,
+ extra_args=()):
args = ['info']
- if imgopts:
+ if use_image_opts:
args.append('--image-opts')
else:
args += ['-f', imgfmt]
--
2.29.2
- [PATCH v3 00/17] iotests: support zstd, Vladimir Sementsov-Ogievskiy, 2021/09/14
- [PATCH v3 04/17] iotests.py: rewrite default luks support in qemu_img, Vladimir Sementsov-Ogievskiy, 2021/09/14
- [PATCH v3 01/17] iotests.py: img_info_log(): rename imgopts argument,
Vladimir Sementsov-Ogievskiy <=
- [PATCH v3 05/17] iotest 303: explicit compression type, Vladimir Sementsov-Ogievskiy, 2021/09/14
- [PATCH v3 02/17] iotests.py: qemu_img*("create"): support IMGOPTS='compression_type=zstd', Vladimir Sementsov-Ogievskiy, 2021/09/14
- [PATCH v3 06/17] iotest 065: explicit compression type, Vladimir Sementsov-Ogievskiy, 2021/09/14
- [PATCH v3 03/17] iotests: drop qemu_img_verbose() helper, Vladimir Sementsov-Ogievskiy, 2021/09/14
- [PATCH v3 08/17] iotests.py: filter compression type out, Vladimir Sementsov-Ogievskiy, 2021/09/14
- [PATCH v3 09/17] iotest 302: use img_info_log() helper, Vladimir Sementsov-Ogievskiy, 2021/09/14
- [PATCH v3 17/17] iotests: declare lack of support for compresion_type in IMGOPTS, Vladimir Sementsov-Ogievskiy, 2021/09/14
- [PATCH v3 07/17] iotests.py: filter out successful output of qemu-img create, Vladimir Sementsov-Ogievskiy, 2021/09/14
- [PATCH v3 11/17] iotests/common.rc: introduce _qcow2_dump_header helper, Vladimir Sementsov-Ogievskiy, 2021/09/14