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
99 lines
4.1 KiB
Diff
99 lines
4.1 KiB
Diff
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
Date: Thu, 23 Dec 2021 17:01:44 +0100
|
|
Subject: iotests: declare lack of support for compresion_type in IMGOPTS
|
|
|
|
Git-commit: e287a351db13f3f6670f4a3f2896f2dde47d07d1
|
|
|
|
compression_type can't be used if we want to create image with
|
|
compat=0.10. So, skip these tests, not many of them.
|
|
|
|
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
|
|
Message-Id: <20211223160144.1097696-20-vsementsov@virtuozzo.com>
|
|
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
|
|
Signed-off-by: Li Zhang <lizhang@suse.de>
|
|
---
|
|
tests/qemu-iotests/031 | 5 +++--
|
|
tests/qemu-iotests/051 | 5 +++--
|
|
tests/qemu-iotests/061 | 6 +++++-
|
|
tests/qemu-iotests/112 | 3 ++-
|
|
tests/qemu-iotests/290 | 2 +-
|
|
5 files changed, 14 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031
|
|
index 648112f7960e909e81fbc4c1be13..ee587b1606fd1b9c8ba1bf6a50b2 100755
|
|
--- a/tests/qemu-iotests/031
|
|
+++ b/tests/qemu-iotests/031
|
|
@@ -42,8 +42,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
|
|
_supported_fmt qcow2
|
|
_supported_proto file fuse
|
|
# We want to test compat=0.10, which does not support external data
|
|
-# files or refcount widths other than 16
|
|
-_unsupported_imgopts data_file 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
|
|
+# files or refcount widths other than 16 or compression type
|
|
+_unsupported_imgopts data_file compression_type \
|
|
+ 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
|
|
|
|
CLUSTER_SIZE=65536
|
|
|
|
diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
|
|
index e9042a621420332ac288060cbec2..f1a506518b981fe28cc498af43bb 100755
|
|
--- a/tests/qemu-iotests/051
|
|
+++ b/tests/qemu-iotests/051
|
|
@@ -41,8 +41,9 @@ _supported_fmt qcow2
|
|
_supported_proto file
|
|
# A compat=0.10 image is created in this test which does not support anything
|
|
# other than refcount_bits=16;
|
|
-# it also will not support an external data file
|
|
-_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' data_file
|
|
+# it also will not support an external data file and compression type
|
|
+_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' data_file \
|
|
+ compression_type
|
|
_require_drivers nbd
|
|
|
|
if [ "$QEMU_DEFAULT_MACHINE" = "pc" ]; then
|
|
diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061
|
|
index 70edf1a1635e1e5df529e130d314..513fbec14cc2bcfbd085b0f092e4 100755
|
|
--- a/tests/qemu-iotests/061
|
|
+++ b/tests/qemu-iotests/061
|
|
@@ -48,7 +48,11 @@ _supported_os Linux
|
|
# not work with it;
|
|
# we have explicit tests for various cluster sizes, the remaining tests
|
|
# require the default 64k cluster
|
|
-_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' data_file cluster_size
|
|
+# we don't have explicit tests for zstd qcow2 compression type, as zstd may be
|
|
+# not compiled in. And we can't create compat images with comression type
|
|
+# extension
|
|
+_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' data_file \
|
|
+ cluster_size compression_type
|
|
|
|
echo
|
|
echo "=== Testing version downgrade with zero expansion ==="
|
|
diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112
|
|
index 07ac74fb2c184c0580ebbedd70f9..53332129931fa67416893b3b2eaf 100755
|
|
--- a/tests/qemu-iotests/112
|
|
+++ b/tests/qemu-iotests/112
|
|
@@ -43,7 +43,8 @@ _supported_proto file fuse
|
|
# This test will set refcount_bits on its own which would conflict with the
|
|
# manual setting; compat will be overridden as well;
|
|
# and external data files do not work well with our refcount testing
|
|
-_unsupported_imgopts refcount_bits 'compat=0.10' data_file
|
|
+# also, compression type is not supported with compat=0.10 used in test
|
|
+_unsupported_imgopts refcount_bits 'compat=0.10' data_file compression_type
|
|
|
|
print_refcount_bits()
|
|
{
|
|
diff --git a/tests/qemu-iotests/290 b/tests/qemu-iotests/290
|
|
index ed80da2685e5ed094985e71c1e30..776b59de1bc8da4bbc67195231c4 100755
|
|
--- a/tests/qemu-iotests/290
|
|
+++ b/tests/qemu-iotests/290
|
|
@@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
|
|
_supported_fmt qcow2
|
|
_supported_proto file fuse
|
|
_supported_os Linux
|
|
-_unsupported_imgopts 'compat=0.10' refcount_bits data_file
|
|
+_unsupported_imgopts 'compat=0.10' refcount_bits data_file compression_type
|
|
|
|
echo
|
|
echo "### Test 'qemu-io -c discard' on a QCOW2 image without a backing file"
|