[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 34/37] iotests: Allow supported and unsupported formats at the sam
From: |
Kevin Wolf |
Subject: |
[PULL 34/37] iotests: Allow supported and unsupported formats at the same time |
Date: |
Fri, 2 Oct 2020 16:43:42 +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>
Message-Id: <20200924152717.287415-31-kwolf@redhat.com>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
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 9695c917e4..f212cec446 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -1062,16 +1062,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
- [PULL 25/37] block/export: Add BLOCK_EXPORT_DELETED event, (continued)
- [PULL 25/37] block/export: Add BLOCK_EXPORT_DELETED event, Kevin Wolf, 2020/10/02
- [PULL 24/37] block/export: Add block-export-del, Kevin Wolf, 2020/10/02
- [PULL 26/37] block/export: Move blk to BlockExport, Kevin Wolf, 2020/10/02
- [PULL 23/37] block/export: Move strong user reference to block_exports, Kevin Wolf, 2020/10/02
- [PULL 28/37] block/export: Add query-block-exports, Kevin Wolf, 2020/10/02
- [PULL 30/37] nbd: Merge nbd_export_new() and nbd_export_create(), Kevin Wolf, 2020/10/02
- [PULL 27/37] block/export: Create BlockBackend in blk_exp_add(), Kevin Wolf, 2020/10/02
- [PULL 29/37] block/export: Move writable to BlockExportOptions, Kevin Wolf, 2020/10/02
- [PULL 31/37] nbd: Deprecate nbd-server-add/remove, Kevin Wolf, 2020/10/02
- [PULL 33/37] iotests: Introduce qemu_nbd_list_log(), Kevin Wolf, 2020/10/02
- [PULL 34/37] iotests: Allow supported and unsupported formats at the same time,
Kevin Wolf <=
- [PULL 36/37] qemu-storage-daemon: Fix help line for --export, Kevin Wolf, 2020/10/02
- [PULL 32/37] iotests: Factor out qemu_tool_pipe_and_status(), Kevin Wolf, 2020/10/02
- [PULL 37/37] qcow2: Use L1E_SIZE in qcow2_write_l1_entry(), Kevin Wolf, 2020/10/02
- [PULL 35/37] iotests: Test block-export-* QMP interface, Kevin Wolf, 2020/10/02
- Re: [PULL 00/37] Block layer patches, Peter Maydell, 2020/10/02