[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/18] iotests/279: Fix for non-qcow2 formats
From: |
Max Reitz |
Subject: |
[PULL 09/18] iotests/279: Fix for non-qcow2 formats |
Date: |
Thu, 20 Feb 2020 17:07:01 +0100 |
First, driver=qcow2 will not work so well with non-qcow2 formats (and
this test claims to support qcow, qed, and vmdk).
Second, vmdk will always report the backing file format to be vmdk.
Filter that out so the output looks like for all other formats.
Third, the flat vmdk subformats do not support backing files, so they
will not work with this test.
Signed-off-by: Max Reitz <address@hidden>
Message-Id: <address@hidden>
Tested-by: Thomas Huth <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/279 | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/tests/qemu-iotests/279 b/tests/qemu-iotests/279
index 6682376808..30d29b1cb2 100755
--- a/tests/qemu-iotests/279
+++ b/tests/qemu-iotests/279
@@ -38,6 +38,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow qcow2 vmdk qed
_supported_proto file
_supported_os Linux
+_unsupported_imgopts "subformat=monolithicFlat" \
+ "subformat=twoGbMaxExtentFlat" \
TEST_IMG="$TEST_IMG.base" _make_test_img 64M
TEST_IMG="$TEST_IMG.mid" _make_test_img -b "$TEST_IMG.base"
@@ -45,11 +47,12 @@ _make_test_img -b "$TEST_IMG.mid"
echo
echo '== qemu-img info --backing-chain =='
-_img_info --backing-chain | _filter_img_info
+_img_info --backing-chain | _filter_img_info | grep -v 'backing file format'
echo
echo '== qemu-img info --backing-chain --image-opts =='
-TEST_IMG="driver=qcow2,file.driver=file,file.filename=$TEST_IMG" _img_info
--backing-chain --image-opts | _filter_img_info
+TEST_IMG="driver=$IMGFMT,file.driver=file,file.filename=$TEST_IMG" _img_info
--backing-chain --image-opts \
+ | _filter_img_info | grep -v 'backing file format'
# success, all done
echo "*** done"
--
2.24.1
- [PULL 01/18] docs: improve qcow2 spec about extending image header, (continued)
- [PULL 01/18] docs: improve qcow2 spec about extending image header, Max Reitz, 2020/02/20
- [PULL 03/18] iotests: Remove the superfluous 2nd check for the availability of quorum, Max Reitz, 2020/02/20
- [PULL 02/18] docs: qcow2: introduce compression type feature, Max Reitz, 2020/02/20
- [PULL 04/18] iotests/147: Fix drive parameters, Max Reitz, 2020/02/20
- [PULL 05/18] qapi: Allow getting flat output from 'query-named-block-nodes', Max Reitz, 2020/02/20
- [PULL 06/18] qemu-img: Add --target-is-zero to convert, Max Reitz, 2020/02/20
- [PULL 07/18] block: always fill entire LUKS header space with zeros, Max Reitz, 2020/02/20
- [PULL 08/18] block/backup-top: fix flags handling, Max Reitz, 2020/02/20
- [PULL 09/18] iotests/279: Fix for non-qcow2 formats,
Max Reitz <=
- [PULL 10/18] block/nbd: Fix hang in .bdrv_close(), Max Reitz, 2020/02/20
- [PULL 11/18] block: Generic file creation fallback, Max Reitz, 2020/02/20
- [PULL 12/18] file-posix: Drop hdev_co_create_opts(), Max Reitz, 2020/02/20
- [PULL 13/18] iscsi: Drop iscsi_co_create_opts(), Max Reitz, 2020/02/20
- [PULL 14/18] iotests: Add test for image creation fallback, Max Reitz, 2020/02/20
- [PULL 15/18] qemu-img: Fix convert -n -B for backing-less targets, Max Reitz, 2020/02/20
- [PULL 16/18] iotests: Test convert -n -B to backing-less target, Max Reitz, 2020/02/20
- [PULL 17/18] block: Fix VM size field width in snapshot dump, Max Reitz, 2020/02/20