[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/24] iotest 303: explicit compression type
From: |
Hanna Reitz |
Subject: |
[PULL 09/24] iotest 303: explicit compression type |
Date: |
Tue, 1 Feb 2022 15:42:18 +0100 |
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
The test prints qcow2 header fields which depends on chosen compression
type. So, let's be explicit in what compression type we want and
independent of IMGOPTS. Test both existing compression types.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20211223160144.1097696-8-vsementsov@virtuozzo.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
---
tests/qemu-iotests/303 | 25 ++++++++++++++++---------
tests/qemu-iotests/303.out | 30 +++++++++++++++++++++++++++++-
2 files changed, 45 insertions(+), 10 deletions(-)
diff --git a/tests/qemu-iotests/303 b/tests/qemu-iotests/303
index 475cb5428d..16c2e10827 100755
--- a/tests/qemu-iotests/303
+++ b/tests/qemu-iotests/303
@@ -54,12 +54,19 @@ def add_bitmap(num, begin, end, disabled):
log('')
-qemu_img_create('-f', iotests.imgfmt, disk, '10M')
-
-add_bitmap(1, 0, 6, False)
-add_bitmap(2, 6, 8, True)
-dump = ['./qcow2.py', disk, 'dump-header']
-subprocess.run(dump)
-# Dump the metadata in JSON format
-dump.append('-j')
-subprocess.run(dump)
+def test(compression_type: str, json_output: bool) -> None:
+ qemu_img_create('-f', iotests.imgfmt,
+ '-o', f'compression_type={compression_type}',
+ disk, '10M')
+ add_bitmap(1, 0, 6, False)
+ add_bitmap(2, 6, 8, True)
+
+ cmd = ['./qcow2.py', disk, 'dump-header']
+ if json_output:
+ cmd.append('-j')
+
+ subprocess.run(cmd)
+
+
+test('zlib', False)
+test('zstd', True)
diff --git a/tests/qemu-iotests/303.out b/tests/qemu-iotests/303.out
index 7c16998587..b3c70827b7 100644
--- a/tests/qemu-iotests/303.out
+++ b/tests/qemu-iotests/303.out
@@ -80,6 +80,34 @@ extra_data_size 0
Bitmap table type size offset
0 all-zeroes 0 0
+Add bitmap 1
+wrote 1048576/1048576 bytes at offset 0
+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+
+wrote 1048576/1048576 bytes at offset 1048576
+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+
+wrote 1048576/1048576 bytes at offset 2097152
+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+
+wrote 1048576/1048576 bytes at offset 3145728
+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+
+wrote 1048576/1048576 bytes at offset 4194304
+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+
+wrote 1048576/1048576 bytes at offset 5242880
+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+
+
+Add bitmap 2
+wrote 1048576/1048576 bytes at offset 6291456
+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+
+wrote 1048576/1048576 bytes at offset 7340032
+1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+
+
{
"magic": 1363560955,
"version": 3,
@@ -94,7 +122,7 @@ Bitmap table type size offset
"refcount_table_clusters": 1,
"nb_snapshots": 0,
"snapshot_offset": 0,
- "incompatible_features": 0,
+ "incompatible_features": 8,
"compatible_features": 0,
"autoclear_features": 1,
"refcount_order": 4,
--
2.34.1
- [PULL 05/24] iotests: specify some unsupported_imgopts for python iotests, (continued)
- [PULL 05/24] iotests: specify some unsupported_imgopts for python iotests, Hanna Reitz, 2022/02/01
- [PULL 04/24] iotests.py: implement unsupported_imgopts, Hanna Reitz, 2022/02/01
- [PULL 02/24] iotests/MRCE: Write data to source, Hanna Reitz, 2022/02/01
- [PULL 23/24] iotests/migration-permissions: New test, Hanna Reitz, 2022/02/01
- [PULL 20/24] iotest 214: explicit compression type, Hanna Reitz, 2022/02/01
- [PULL 21/24] iotests: declare lack of support for compresion_type in IMGOPTS, Hanna Reitz, 2022/02/01
- [PULL 18/24] iotests: bash tests: filter compression type, Hanna Reitz, 2022/02/01
- [PULL 13/24] iotest 302: use img_info_log() helper, Hanna Reitz, 2022/02/01
- [PULL 15/24] iotests/common.rc: introduce _qcow2_dump_header helper, Hanna Reitz, 2022/02/01
- [PULL 17/24] iotest 39: use _qcow2_dump_header, Hanna Reitz, 2022/02/01
- [PULL 09/24] iotest 303: explicit compression type,
Hanna Reitz <=
- [PULL 22/24] block-backend: Retain permissions after migration, Hanna Reitz, 2022/02/01
- [PULL 24/24] block.h: remove outdated comment, Hanna Reitz, 2022/02/01
- [PULL 03/24] iotests.py: img_info_log(): rename imgopts argument, Hanna Reitz, 2022/02/01
- [PULL 11/24] iotests.py: filter out successful output of qemu-img create, Hanna Reitz, 2022/02/01
- [PULL 16/24] iotests: massive use _qcow2_dump_header, Hanna Reitz, 2022/02/01
- [PULL 01/24] tests/qemu-iotests: Fix 051 for binaries without 'lsi53c895a', Hanna Reitz, 2022/02/01
- Re: [PULL 00/24] Block patches, Peter Maydell, 2022/02/01