[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 11/11] iotests: Fix iotests 110 and 126
From: |
Max Reitz |
Subject: |
[Qemu-block] [PULL 11/11] iotests: Fix iotests 110 and 126 |
Date: |
Tue, 7 May 2019 17:18:19 +0200 |
A recent patch results in qemu-img reporting the backing file format of
vmdk images as vmdk. This broke iotests 110 and 126.
Fixes: 7502be838e2fb62cc00f9e55f632e0b88ead5e6e
Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Signed-off-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/110 | 10 +++++++---
tests/qemu-iotests/126 | 10 +++++++---
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110
index fad672c1ae..33b169ffd4 100755
--- a/tests/qemu-iotests/110
+++ b/tests/qemu-iotests/110
@@ -53,8 +53,12 @@ TEST_IMG="$TEST_IMG.base" _make_test_img 64M
_make_test_img -b "$TEST_IMG_REL.base" 64M
# qemu should be able to reconstruct the filename, so relative backing names
# should work
+# (We have to filter the backing file format because vmdk always
+# reports it (as vmdk), whereas other image formats would do so only
+# with the backing_fmt creation option, which neither vmdk nor qcow
+# support)
TEST_IMG="json:{'driver':'$IMGFMT','file':{'driver':'file','filename':'$TEST_IMG'}}"
\
- _img_info | _filter_img_info
+ _img_info | _filter_img_info | grep -v 'backing file format'
echo
echo '=== Non-reconstructable filename ==='
@@ -78,7 +82,7 @@ TEST_IMG="json:{
}
]
}
-}" _img_info | _filter_img_info
+}" _img_info | _filter_img_info | grep -v 'backing file format'
echo
echo '=== Backing name is always relative to the backed image ==='
@@ -110,7 +114,7 @@ TEST_IMG="json:{
}
]
}
-}" _img_info | _filter_img_info
+}" _img_info | _filter_img_info | grep -v 'backing file format'
# success, all done
diff --git a/tests/qemu-iotests/126 b/tests/qemu-iotests/126
index 96dc048d59..e3ee65c606 100755
--- a/tests/qemu-iotests/126
+++ b/tests/qemu-iotests/126
@@ -62,8 +62,12 @@ TOP_IMG="$TEST_DIR/image:top.$IMGFMT"
TEST_IMG=$BASE_IMG _make_test_img 64M
TEST_IMG=$TOP_IMG _make_test_img -b ./image:base.$IMGFMT
-# The default cluster size depends on the image format
-TEST_IMG=$TOP_IMG _img_info | grep -v 'cluster_size'
+# (1) The default cluster size depends on the image format
+# (2) vmdk only supports vmdk backing files, so it always reports the
+# format of its backing file as such (but neither it nor qcow
+# support the backing_fmt creation option, so we cannot use that to
+# harmonize the output across all image formats this test supports)
+TEST_IMG=$TOP_IMG _img_info | grep -ve 'cluster_size' -e 'backing file format'
_rm_test_img "$BASE_IMG"
_rm_test_img "$TOP_IMG"
@@ -79,7 +83,7 @@ TOP_IMG="file:image:top.$IMGFMT"
TEST_IMG=$BASE_IMG _make_test_img 64M
TEST_IMG=$TOP_IMG _make_test_img -b "$BASE_IMG"
-TEST_IMG=$TOP_IMG _img_info | grep -v 'cluster_size'
+TEST_IMG=$TOP_IMG _img_info | grep -ve 'cluster_size' -e 'backing file format'
_rm_test_img "$BASE_IMG"
_rm_test_img "image:top.$IMGFMT"
--
2.20.1
- [Qemu-block] [PULL 01/11] qcow2-refcount: fix check_oflag_copied, (continued)
- [Qemu-block] [PULL 01/11] qcow2-refcount: fix check_oflag_copied, Max Reitz, 2019/05/07
- [Qemu-block] [PULL 02/11] qcow2-refcount: avoid eating RAM, Max Reitz, 2019/05/07
- [Qemu-block] [PULL 04/11] qcow2-refcount: check_refcounts_l2: don't count fixed cluster as allocated, Max Reitz, 2019/05/07
- [Qemu-block] [PULL 05/11] qcow2-refcount: don't mask corruptions under internal errors, Max Reitz, 2019/05/07
- [Qemu-block] [PULL 03/11] qcow2-refcount: check_refcounts_l2: reduce ignored overlaps, Max Reitz, 2019/05/07
- [Qemu-block] [PULL 06/11] qcow2: discard bitmap when removed, Max Reitz, 2019/05/07
- [Qemu-block] [PULL 07/11] block/ssh: Implement .bdrv_refresh_filename(), Max Reitz, 2019/05/07
- [Qemu-block] [PULL 08/11] block/ssh: Implement .bdrv_dirname(), Max Reitz, 2019/05/07
- [Qemu-block] [PULL 09/11] block: Assert that drv->bdrv_child_perm is set in bdrv_child_perm(), Max Reitz, 2019/05/07
- [Qemu-block] [PULL 10/11] commit: Use bdrv_append() in commit_start(), Max Reitz, 2019/05/07
- [Qemu-block] [PULL 11/11] iotests: Fix iotests 110 and 126,
Max Reitz <=
- Re: [Qemu-block] [PULL 00/11] Block patches, Peter Maydell, 2019/05/09