5435e8a804
Backport patches related with iotest from upstream * Patches added: block-backend-Retain-permissions-after-m.patch iotest-065-explicit-compression-type.patch iotest-214-explicit-compression-type.patch iotest-302-use-img_info_log-helper.patch iotest-303-explicit-compression-type.patch iotest-39-use-_qcow2_dump_header.patch iotests-60-more-accurate-set-dirty-bit-i.patch iotests-bash-tests-filter-compression-ty.patch iotests-common.rc-introduce-_qcow2_dump_.patch iotests-declare-lack-of-support-for-comp.patch iotests-drop-qemu_img_verbose-helper.patch iotests-massive-use-_qcow2_dump_header.patch iotests-MRCE-Write-data-to-source.patch iotests.py-filter-out-successful-output-.patch iotests.py-img_info_log-rename-imgopts-a.patch iotests.py-implement-unsupported_imgopts.patch iotests.py-qemu_img-create-support-IMGOP.patch iotests.py-rewrite-default-luks-support-.patch iotests-specify-some-unsupported_imgopts.patch qcow2-simple-case-support-for-downgradin.patch tests-qemu-iotests-Fix-051-for-binaries-.patch OBS-URL: https://build.opensuse.org/request/show/955876 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=690
102 lines
3.3 KiB
Diff
102 lines
3.3 KiB
Diff
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
Date: Thu, 23 Dec 2021 17:01:32 +0100
|
|
Subject: iotest 303: explicit compression type
|
|
|
|
Git-commit: 677e0bae686e7c670a71d1f6a491a7f06f77de73
|
|
|
|
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>
|
|
Signed-off-by: Li Zhang <lizhang@suse.de>
|
|
---
|
|
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 475cb5428db4f047b7db63776ca0..16c2e1082768f67c14c8665b2b2c 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 7c16998587840607918fd777fb99..b3c70827b74a253209527106a4a9 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,
|