[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 07/19] iotest 303: explicit compression type
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v5 07/19] iotest 303: explicit compression type |
Date: |
Thu, 23 Dec 2021 17:01:32 +0100 |
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>
---
tests/qemu-iotests/303 | 23 +++++++++++++++--------
tests/qemu-iotests/303.out | 30 +++++++++++++++++++++++++++++-
2 files changed, 44 insertions(+), 9 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')
+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)
-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)
+ 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.31.1
- [PATCH v5 00/19] iotests: support zstd, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 02/19] iotests.py: implement unsupported_imgopts, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 19/19] iotests: declare lack of support for compresion_type in IMGOPTS, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 01/19] iotests.py: img_info_log(): rename imgopts argument, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 04/19] iotests.py: qemu_img*("create"): support IMGOPTS='compression_type=zstd', Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 18/19] iotest 214: explicit compression type, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 03/19] iotests: specify some unsupported_imgopts for python iotests, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 05/19] iotests: drop qemu_img_verbose() helper, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 07/19] iotest 303: explicit compression type,
Vladimir Sementsov-Ogievskiy <=
- [PATCH v5 06/19] iotests.py: rewrite default luks support in qemu_img, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 08/19] iotest 065: explicit compression type, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 11/19] iotest 302: use img_info_log() helper, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 10/19] iotests.py: filter compression type out, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 12/19] qcow2: simple case support for downgrading of qcow2 images with zstd, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 09/19] iotests.py: filter out successful output of qemu-img create, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 13/19] iotests/common.rc: introduce _qcow2_dump_header helper, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 14/19] iotests: massive use _qcow2_dump_header, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 17/19] iotests 60: more accurate set dirty bit in qcow2 header, Vladimir Sementsov-Ogievskiy, 2021/12/23
- [PATCH v5 15/19] iotest 39: use _qcow2_dump_header, Vladimir Sementsov-Ogievskiy, 2021/12/23