[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 01/19] iotests.py: img_info_log(): rename imgopts argument
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v5 01/19] iotests.py: img_info_log(): rename imgopts argument |
Date: |
Thu, 23 Dec 2021 17:01:26 +0100 |
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 a4dcc5fe59..10b0a0b87c 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 83bfedb902..9b374dad3d 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -219,9 +219,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.31.1
- [PATCH v5 00/19] iotests: support zstd, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 01/19] iotests.py: img_info_log(): rename imgopts argument,
Vladimir Sementsov-Ogievskiy <=
- [PATCH v5 02/19] iotests.py: implement unsupported_imgopts, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 19/19] iotests: declare lack of support for compresion_type in IMGOPTS, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 03/19] iotests: specify some unsupported_imgopts for python iotests, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 04/19] iotests.py: qemu_img*("create"): support IMGOPTS='compression_type=zstd', Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 18/19] iotest 214: explicit compression type, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 05/19] iotests: drop qemu_img_verbose() helper, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 06/19] iotests.py: rewrite default luks support in qemu_img, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 07/19] iotest 303: explicit compression type, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 11/19] iotest 302: use img_info_log() helper, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 08/19] iotest 065: explicit compression type, Vladimir Sementsov-Ogievskiy, 2021/12/23