From: Hanna Reitz <hreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Peter Maydell <peter.maydell@linaro.org>,
Hanna Reitz <hreitz@redhat.com>,
Richard Henderson <richard.henderson@linaro.org>,
qemu-devel@nongnu.org
Subject: [PULL 12/24] iotests.py: filter compression type out
Date: Tue, 1 Feb 2022 15:42:21 +0100 [thread overview]
Message-ID: <20220201144233.617021-13-hreitz@redhat.com> (raw)
In-Reply-To: <20220201144233.617021-1-hreitz@redhat.com>
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
We want iotests pass with both the default zlib compression and with
IMGOPTS='compression_type=zstd'.
Actually the only test that is interested in real compression type in
test output is 287 (test for qcow2 compression type) and it's in bash.
So for now we can safely filter out compression type in all qcow2
tests.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Message-Id: <20211223160144.1097696-11-vsementsov@virtuozzo.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
---
tests/qemu-iotests/206.out | 10 +++++-----
tests/qemu-iotests/242.out | 10 +++++-----
tests/qemu-iotests/274.out | 10 +++++-----
tests/qemu-iotests/iotests.py | 2 ++
4 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/tests/qemu-iotests/206.out b/tests/qemu-iotests/206.out
index 80cd274223..7e95694777 100644
--- a/tests/qemu-iotests/206.out
+++ b/tests/qemu-iotests/206.out
@@ -18,7 +18,7 @@ virtual size: 128 MiB (134217728 bytes)
cluster_size: 65536
Format specific information:
compat: 1.1
- compression type: zlib
+ compression type: COMPRESSION_TYPE
lazy refcounts: false
refcount bits: 16
corrupt: false
@@ -42,7 +42,7 @@ virtual size: 64 MiB (67108864 bytes)
cluster_size: 65536
Format specific information:
compat: 1.1
- compression type: zlib
+ compression type: COMPRESSION_TYPE
lazy refcounts: false
refcount bits: 16
corrupt: false
@@ -66,7 +66,7 @@ virtual size: 32 MiB (33554432 bytes)
cluster_size: 2097152
Format specific information:
compat: 1.1
- compression type: zlib
+ compression type: COMPRESSION_TYPE
lazy refcounts: true
refcount bits: 1
corrupt: false
@@ -92,7 +92,7 @@ backing file: TEST_IMG.base
backing file format: IMGFMT
Format specific information:
compat: 0.10
- compression type: zlib
+ compression type: COMPRESSION_TYPE
refcount bits: 16
=== Successful image creation (encrypted) ===
@@ -109,7 +109,7 @@ encrypted: yes
cluster_size: 65536
Format specific information:
compat: 1.1
- compression type: zlib
+ compression type: COMPRESSION_TYPE
lazy refcounts: false
refcount bits: 16
encrypt:
diff --git a/tests/qemu-iotests/242.out b/tests/qemu-iotests/242.out
index 3759c99284..ce231424a7 100644
--- a/tests/qemu-iotests/242.out
+++ b/tests/qemu-iotests/242.out
@@ -12,7 +12,7 @@ virtual size: 1 MiB (1048576 bytes)
cluster_size: 65536
Format specific information:
compat: 1.1
- compression type: zlib
+ compression type: COMPRESSION_TYPE
lazy refcounts: false
refcount bits: 16
corrupt: false
@@ -34,7 +34,7 @@ virtual size: 1 MiB (1048576 bytes)
cluster_size: 65536
Format specific information:
compat: 1.1
- compression type: zlib
+ compression type: COMPRESSION_TYPE
lazy refcounts: false
bitmaps:
[0]:
@@ -68,7 +68,7 @@ virtual size: 1 MiB (1048576 bytes)
cluster_size: 65536
Format specific information:
compat: 1.1
- compression type: zlib
+ compression type: COMPRESSION_TYPE
lazy refcounts: false
bitmaps:
[0]:
@@ -110,7 +110,7 @@ virtual size: 1 MiB (1048576 bytes)
cluster_size: 65536
Format specific information:
compat: 1.1
- compression type: zlib
+ compression type: COMPRESSION_TYPE
lazy refcounts: false
bitmaps:
[0]:
@@ -161,7 +161,7 @@ virtual size: 1 MiB (1048576 bytes)
cluster_size: 65536
Format specific information:
compat: 1.1
- compression type: zlib
+ compression type: COMPRESSION_TYPE
lazy refcounts: false
bitmaps:
[0]:
diff --git a/tests/qemu-iotests/274.out b/tests/qemu-iotests/274.out
index 1d2928e14d..1ce40d839a 100644
--- a/tests/qemu-iotests/274.out
+++ b/tests/qemu-iotests/274.out
@@ -50,7 +50,7 @@ backing file: TEST_DIR/PID-base
backing file format: IMGFMT
Format specific information:
compat: 1.1
- compression type: zlib
+ compression type: COMPRESSION_TYPE
lazy refcounts: false
refcount bits: 16
corrupt: false
@@ -79,7 +79,7 @@ backing file: TEST_DIR/PID-base
backing file format: IMGFMT
Format specific information:
compat: 1.1
- compression type: zlib
+ compression type: COMPRESSION_TYPE
lazy refcounts: false
refcount bits: 16
corrupt: false
@@ -114,7 +114,7 @@ backing file: TEST_DIR/PID-base
backing file format: IMGFMT
Format specific information:
compat: 1.1
- compression type: zlib
+ compression type: COMPRESSION_TYPE
lazy refcounts: false
refcount bits: 16
corrupt: false
@@ -141,7 +141,7 @@ virtual size: 2 MiB (2097152 bytes)
cluster_size: 65536
Format specific information:
compat: 1.1
- compression type: zlib
+ compression type: COMPRESSION_TYPE
lazy refcounts: false
refcount bits: 16
corrupt: false
@@ -176,7 +176,7 @@ backing file: TEST_DIR/PID-base
backing file format: IMGFMT
Format specific information:
compat: 1.1
- compression type: zlib
+ compression type: COMPRESSION_TYPE
lazy refcounts: false
refcount bits: 16
corrupt: false
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 65780c6098..8cdb381f2a 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -497,6 +497,8 @@ def filter_img_info(output, filename):
'uuid: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX',
line)
line = re.sub('cid: [0-9]+', 'cid: XXXXXXXXXX', line)
+ line = re.sub('(compression type: )(zlib|zstd)', r'\1COMPRESSION_TYPE',
+ line)
lines.append(line)
return '\n'.join(lines)
--
2.34.1
next prev parent reply other threads:[~2022-02-01 15:58 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-01 14:42 [PULL 00/24] Block patches Hanna Reitz
2022-02-01 14:42 ` [PULL 01/24] tests/qemu-iotests: Fix 051 for binaries without 'lsi53c895a' Hanna Reitz
2022-02-01 14:42 ` [PULL 02/24] iotests/MRCE: Write data to source Hanna Reitz
2022-02-01 14:42 ` [PULL 03/24] iotests.py: img_info_log(): rename imgopts argument Hanna Reitz
2022-02-01 14:42 ` [PULL 04/24] iotests.py: implement unsupported_imgopts Hanna Reitz
2022-02-01 14:42 ` [PULL 05/24] iotests: specify some unsupported_imgopts for python iotests Hanna Reitz
2022-02-01 14:42 ` [PULL 06/24] iotests.py: qemu_img*("create"): support IMGOPTS='compression_type=zstd' Hanna Reitz
2022-02-01 14:42 ` [PULL 07/24] iotests: drop qemu_img_verbose() helper Hanna Reitz
2022-02-01 14:42 ` [PULL 08/24] iotests.py: rewrite default luks support in qemu_img Hanna Reitz
2022-02-01 14:42 ` [PULL 09/24] iotest 303: explicit compression type Hanna Reitz
2022-02-01 14:42 ` [PULL 10/24] iotest 065: " Hanna Reitz
2022-02-14 19:53 ` Thomas Huth
2022-02-01 14:42 ` [PULL 11/24] iotests.py: filter out successful output of qemu-img create Hanna Reitz
2022-02-01 14:42 ` Hanna Reitz [this message]
2022-02-01 14:42 ` [PULL 13/24] iotest 302: use img_info_log() helper Hanna Reitz
2022-02-01 14:42 ` [PULL 14/24] qcow2: simple case support for downgrading of qcow2 images with zstd Hanna Reitz
2022-02-01 14:42 ` [PULL 15/24] iotests/common.rc: introduce _qcow2_dump_header helper Hanna Reitz
2022-02-01 14:42 ` [PULL 16/24] iotests: massive use _qcow2_dump_header Hanna Reitz
2022-02-01 14:42 ` [PULL 17/24] iotest 39: " Hanna Reitz
2022-02-01 14:42 ` [PULL 18/24] iotests: bash tests: filter compression type Hanna Reitz
2022-02-01 14:42 ` [PULL 19/24] iotests 60: more accurate set dirty bit in qcow2 header Hanna Reitz
2022-02-01 14:42 ` [PULL 20/24] iotest 214: explicit compression type Hanna Reitz
2022-02-01 14:42 ` [PULL 21/24] iotests: declare lack of support for compresion_type in IMGOPTS Hanna Reitz
2022-02-01 14:42 ` [PULL 22/24] block-backend: Retain permissions after migration Hanna Reitz
2022-02-01 14:42 ` [PULL 23/24] iotests/migration-permissions: New test Hanna Reitz
2022-02-01 14:42 ` [PULL 24/24] block.h: remove outdated comment Hanna Reitz
2022-02-01 19:47 ` [PULL 00/24] Block patches Peter Maydell
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=20220201144233.617021-13-hreitz@redhat.com \
--to=hreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/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).