On 07/28/2017 08:14 AM, Kevin Wolf wrote:
> qemu-iotests 059 left a whole lot of image files behind in the scratch
> directory because VMDK creates additional files for extents and cleaning
> them up requires the original image intact (it parses qemu-img info
> output to find all extent files), but the image overwrote it many times
> like it works for all other image formats.
>
> In addition, _use_sample_img overwrites the TEST_IMG variable, causing
> new images created afterwards to reuse the name of the sample file
> rather than the usual t.IMGFMT.
>
> This patch adds an intermediate _cleanup_test_img after each subtest
> that created an image file with additional extent files, and also after
> each use of a sample image. _cleanup_test_img is also changed so that it
> resets TEST_IMG after a sample image is cleaned up.
>
> Note that this test was failing before this commit and continues to do
> so after it. This failure was introduced in commit 9877860 ('block/vmdk:
> Report failures in vmdk_read_cid()') and needs to be dealt with
> separately.
> @@ -30,6 +30,7 @@ status=1 # failure is the default!
> _cleanup()
> {
> _cleanup_test_img
> + rm -f "$TEST_IMG.qcow2"
Care to fix the TAB damage while you're in the neighborhood?
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
signature.asc
Description: OpenPGP digital signature
