Commit 1278dce7 authored by Max Reitz's avatar Max Reitz
Browse files

iotests: Fix iotests 110 and 126 



A recent patch results in qemu-img reporting the backing file format of
vmdk images as vmdk.  This broke iotests 110 and 126.

Fixes: 7502be83
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Message-id: 20190415154129.31021-1-mreitz@redhat.com
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 6a634199

tests/qemu-iotests/110

+7 −3
Original line number Diff line number Diff line
@@ -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

tests/qemu-iotests/126

+7 −3
Original line number Diff line number Diff line
@@ -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"