[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 30/31] iotests: Allow supported and unsupported formats at the
From: |
Kevin Wolf |
Subject: |
[PATCH v2 30/31] iotests: Allow supported and unsupported formats at the same time |
Date: |
Thu, 24 Sep 2020 17:27:16 +0200 |
This is useful for specifying 'generic' as supported (which includes
only writable image formats), but still excluding some incompatible
writable formats.
It also removes more lines than it adds.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
tests/qemu-iotests/iotests.py | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index cb9f90f737..9c33689cba 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -1064,16 +1064,12 @@ def case_notrun(reason):
def _verify_image_format(supported_fmts: Sequence[str] = (),
unsupported_fmts: Sequence[str] = ()) -> None:
- assert not (supported_fmts and unsupported_fmts)
-
if 'generic' in supported_fmts and \
os.environ.get('IMGFMT_GENERIC', 'true') == 'true':
# similar to
# _supported_fmt generic
# for bash tests
- if imgfmt == 'luks':
- verify_working_luks()
- return
+ supported_fmts = ()
not_sup = supported_fmts and (imgfmt not in supported_fmts)
if not_sup or (imgfmt in unsupported_fmts):
--
2.25.4
- [PATCH v2 20/31] block/export: Add block-export-del, (continued)
- [PATCH v2 20/31] block/export: Add block-export-del, Kevin Wolf, 2020/09/24
- [PATCH v2 17/31] block/export: Add blk_exp_close_all(_type), Kevin Wolf, 2020/09/24
- [PATCH v2 22/31] block/export: Move blk to BlockExport, Kevin Wolf, 2020/09/24
- [PATCH v2 18/31] block/export: Add 'id' option to block-export-add, Kevin Wolf, 2020/09/24
- [PATCH v2 21/31] block/export: Add BLOCK_EXPORT_DELETED event, Kevin Wolf, 2020/09/24
- [PATCH v2 24/31] block/export: Add query-block-exports, Kevin Wolf, 2020/09/24
- [PATCH v2 25/31] block/export: Move writable to BlockExportOptions, Kevin Wolf, 2020/09/24
- [PATCH v2 26/31] nbd: Merge nbd_export_new() and nbd_export_create(), Kevin Wolf, 2020/09/24
- [PATCH v2 30/31] iotests: Allow supported and unsupported formats at the same time,
Kevin Wolf <=
- [PATCH v2 28/31] iotests: Factor out qemu_tool_pipe_and_status(), Kevin Wolf, 2020/09/24
- [PATCH v2 23/31] block/export: Create BlockBackend in blk_exp_add(), Kevin Wolf, 2020/09/24
- [PATCH v2 31/31] iotests: Test block-export-* QMP interface, Kevin Wolf, 2020/09/24
- [PATCH v2 29/31] iotests: Introduce qemu_nbd_list_log(), Kevin Wolf, 2020/09/24
- [PATCH v2 27/31] nbd: Deprecate nbd-server-add/remove, Kevin Wolf, 2020/09/24