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
32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
Date: Thu, 23 Dec 2021 17:01:40 +0100
|
|
Subject: iotest 39: use _qcow2_dump_header
|
|
|
|
Git-commit: 72be51ddb3d10974da5128ad20ee5ca7a13ddd54
|
|
|
|
_qcow2_dump_header has filter for compression type, so this change
|
|
makes test pass with IMGOPTS='compression_type=zstd'.
|
|
|
|
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
Reviewed-by: Max Reitz <mreitz@redhat.com>
|
|
Message-Id: <20211223160144.1097696-16-vsementsov@virtuozzo.com>
|
|
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
|
|
Signed-off-by: Li Zhang <lizhang@suse.de>
|
|
---
|
|
tests/qemu-iotests/039 | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039
|
|
index 8e783a8380666f26d237c7233602..00d379cde259d64a46e2a49d9f20 100755
|
|
--- a/tests/qemu-iotests/039
|
|
+++ b/tests/qemu-iotests/039
|
|
@@ -142,7 +142,7 @@ $QEMU_IMG commit "$TEST_IMG"
|
|
|
|
# The dirty bit must not be set
|
|
_qcow2_dump_header | grep incompatible_features
|
|
-$PYTHON qcow2.py "$TEST_IMG".base dump-header | grep incompatible_features
|
|
+_qcow2_dump_header "$TEST_IMG".base | grep incompatible_features
|
|
|
|
_check_test_img
|
|
TEST_IMG="$TEST_IMG".base _check_test_img
|