From: Hanna Reitz <hreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Thomas Huth <thuth@redhat.com>, Kevin Wolf <kwolf@redhat.com>,
Hanna Reitz <hreitz@redhat.com>,
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
qemu-devel@nongnu.org
Subject: [PATCH 2/2] iotests/303: Check for zstd support
Date: Mon, 21 Feb 2022 18:08:45 +0100 [thread overview]
Message-ID: <20220221170845.628429-3-hreitz@redhat.com> (raw)
In-Reply-To: <20220221170845.628429-1-hreitz@redhat.com>
303 runs two test cases, one of which requires zstd support.
Unfortunately, given that this is not a unittest-style test, we cannot
easily skip that single case, and instead can only skip the whole test.
(Alternatively, we could split this test into a zlib and a zstd part,
but that seems excessive, given that this test is not in auto and thus
likely only run by developers who have zstd support compiled in.)
Fixes: 677e0bae686e7c670a71d1f ("iotest 303: explicit compression type")
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
---
tests/qemu-iotests/303 | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/tests/qemu-iotests/303 b/tests/qemu-iotests/303
index 16c2e10827..5a3efb4ba3 100755
--- a/tests/qemu-iotests/303
+++ b/tests/qemu-iotests/303
@@ -21,7 +21,8 @@
import iotests
import subprocess
-from iotests import qemu_img_create, qemu_io, file_path, log, filter_qemu_io
+from iotests import notrun, qemu_img_pipe_and_status, qemu_io, file_path, \
+ log, filter_qemu_io
iotests.script_initialize(supported_fmts=['qcow2'],
unsupported_imgopts=['refcount_bits', 'compat'])
@@ -55,9 +56,15 @@ def add_bitmap(num, begin, end, disabled):
def test(compression_type: str, json_output: bool) -> None:
- qemu_img_create('-f', iotests.imgfmt,
- '-o', f'compression_type={compression_type}',
- disk, '10M')
+ opts = f'compression_type={compression_type}'
+ output, status = qemu_img_pipe_and_status('create',
+ '-f', iotests.imgfmt,
+ '-o', opts,
+ disk, '10M')
+ if status == 1 and \
+ "'compression-type' does not accept value 'zstd'" in output:
+ notrun('zstd compression not supported')
+
add_bitmap(1, 0, 6, False)
add_bitmap(2, 6, 8, True)
--
2.34.1
next prev parent reply other threads:[~2022-02-21 17:19 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-21 17:08 [PATCH 0/2] iotests: Check for zstd support Hanna Reitz
2022-02-21 17:08 ` [PATCH 1/2] iotests/065: " Hanna Reitz
2022-02-21 17:20 ` Thomas Huth
2022-02-22 15:44 ` Vladimir Sementsov-Ogievskiy
2022-03-02 11:14 ` Hanna Reitz
2022-02-21 17:08 ` Hanna Reitz [this message]
2022-02-21 17:27 ` [PATCH 2/2] iotests/303: " Thomas Huth
2022-02-22 15:55 ` Vladimir Sementsov-Ogievskiy
2022-03-02 11:09 ` Hanna Reitz
2022-03-02 11:31 ` Vladimir Sementsov-Ogievskiy
2022-03-02 11:37 ` Hanna Reitz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220221170845.628429-3-hreitz@redhat.com \
--to=hreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
--cc=vsementsov@virtuozzo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).