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
79 lines
3.7 KiB
Diff
79 lines
3.7 KiB
Diff
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
Date: Thu, 23 Dec 2021 17:01:33 +0100
|
|
Subject: iotest 065: explicit compression type
|
|
|
|
Git-commit: 12a936171d71f839dc907fff7887358a05ac20f8
|
|
|
|
The test checks different options. It of course fails if set
|
|
IMGOPTS='compression_type=zstd'. 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: Hanna Reitz <hreitz@redhat.com>
|
|
Message-Id: <20211223160144.1097696-9-vsementsov@virtuozzo.com>
|
|
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
|
|
Signed-off-by: Li Zhang <lizhang@suse.de>
|
|
---
|
|
tests/qemu-iotests/065 | 16 ++++++++--------
|
|
1 file changed, 8 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/tests/qemu-iotests/065 b/tests/qemu-iotests/065
|
|
index dc7716275f0d5e8b6aeb572244fb..f7c1b68dadbaf151781dfc031166 100755
|
|
--- a/tests/qemu-iotests/065
|
|
+++ b/tests/qemu-iotests/065
|
|
@@ -88,7 +88,7 @@ class TestQMP(TestImageInfoSpecific):
|
|
|
|
class TestQCow2(TestQemuImgInfo):
|
|
'''Testing a qcow2 version 2 image'''
|
|
- img_options = 'compat=0.10'
|
|
+ img_options = 'compat=0.10,compression_type=zlib'
|
|
json_compare = { 'compat': '0.10', 'refcount-bits': 16,
|
|
'compression-type': 'zlib' }
|
|
human_compare = [ 'compat: 0.10', 'compression type: zlib',
|
|
@@ -96,17 +96,17 @@ class TestQCow2(TestQemuImgInfo):
|
|
|
|
class TestQCow3NotLazy(TestQemuImgInfo):
|
|
'''Testing a qcow2 version 3 image with lazy refcounts disabled'''
|
|
- img_options = 'compat=1.1,lazy_refcounts=off'
|
|
+ img_options = 'compat=1.1,lazy_refcounts=off,compression_type=zstd'
|
|
json_compare = { 'compat': '1.1', 'lazy-refcounts': False,
|
|
'refcount-bits': 16, 'corrupt': False,
|
|
- 'compression-type': 'zlib', 'extended-l2': False }
|
|
- human_compare = [ 'compat: 1.1', 'compression type: zlib',
|
|
+ 'compression-type': 'zstd', 'extended-l2': False }
|
|
+ human_compare = [ 'compat: 1.1', 'compression type: zstd',
|
|
'lazy refcounts: false', 'refcount bits: 16',
|
|
'corrupt: false', 'extended l2: false' ]
|
|
|
|
class TestQCow3Lazy(TestQemuImgInfo):
|
|
'''Testing a qcow2 version 3 image with lazy refcounts enabled'''
|
|
- img_options = 'compat=1.1,lazy_refcounts=on'
|
|
+ img_options = 'compat=1.1,lazy_refcounts=on,compression_type=zlib'
|
|
json_compare = { 'compat': '1.1', 'lazy-refcounts': True,
|
|
'refcount-bits': 16, 'corrupt': False,
|
|
'compression-type': 'zlib', 'extended-l2': False }
|
|
@@ -117,7 +117,7 @@ class TestQCow3Lazy(TestQemuImgInfo):
|
|
class TestQCow3NotLazyQMP(TestQMP):
|
|
'''Testing a qcow2 version 3 image with lazy refcounts disabled, opening
|
|
with lazy refcounts enabled'''
|
|
- img_options = 'compat=1.1,lazy_refcounts=off'
|
|
+ img_options = 'compat=1.1,lazy_refcounts=off,compression_type=zlib'
|
|
qemu_options = 'lazy-refcounts=on'
|
|
compare = { 'compat': '1.1', 'lazy-refcounts': False,
|
|
'refcount-bits': 16, 'corrupt': False,
|
|
@@ -127,11 +127,11 @@ class TestQCow3NotLazyQMP(TestQMP):
|
|
class TestQCow3LazyQMP(TestQMP):
|
|
'''Testing a qcow2 version 3 image with lazy refcounts enabled, opening
|
|
with lazy refcounts disabled'''
|
|
- img_options = 'compat=1.1,lazy_refcounts=on'
|
|
+ img_options = 'compat=1.1,lazy_refcounts=on,compression_type=zstd'
|
|
qemu_options = 'lazy-refcounts=off'
|
|
compare = { 'compat': '1.1', 'lazy-refcounts': True,
|
|
'refcount-bits': 16, 'corrupt': False,
|
|
- 'compression-type': 'zlib', 'extended-l2': False }
|
|
+ 'compression-type': 'zstd', 'extended-l2': False }
|
|
|
|
TestImageInfoSpecific = None
|
|
TestQemuImgInfo = None
|