Commit 8c97fcf4 authored by Max Reitz's avatar Max Reitz
Browse files

iotests: Fix 020 for vmdk 



vmdk cannot work with anything but vmdk backing files, so make the
backing file be the same format as the overlay.

Reported-by: default avatarJohn Snow <jsnow@redhat.com>
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Message-id: 20171123020832.8165-11-mreitz@redhat.com
Reviewed-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent a03a57a0

tests/qemu-iotests/020

+6 −3
Original line number Diff line number Diff line
@@ -111,10 +111,12 @@ echo 
echo 'Testing failing commit'

echo



TEST_IMG="$TEST_IMG.base" _make_test_img 1M



# Create an image with a null backing file to which committing will fail (with

# ENOSPC so we can distinguish the result from some generic EIO which may be

# generated anywhere in the block layer)

_make_test_img -b "json:{'driver': 'raw',

_make_test_img -b "json:{'driver': '$IMGFMT',

                         'file': {

                             'driver': 'blkdebug',

                             'inject-error': [{
@@ -123,14 +125,15 @@ _make_test_img -b "json:{'driver': 'raw', 
                                 'once': true

                             }],

                             'image': {

                                 'driver': 'null-co'

                                 'driver': 'file',

                                 'filename': '$TEST_IMG.base'

                             }}}"



# Just write anything so committing will not be a no-op

$QEMU_IO -c 'writev 0 64k' "$TEST_IMG" | _filter_qemu_io



$QEMU_IMG commit "$TEST_IMG"

_cleanup_test_img

_cleanup



# success, all done

echo "*** done"

tests/qemu-iotests/020.out

+4 −2
Original line number Diff line number Diff line
@@ -1078,7 +1078,8 @@ No errors were found on the image. 


Testing failing commit



Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 backing_file=json:{'driver': 'raw',,

Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=1048576

Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576 backing_file=json:{'driver': 'IMGFMT',,

                         'file': {

                             'driver': 'blkdebug',,

                             'inject-error': [{
@@ -1087,7 +1088,8 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 backing_file=json:{'d 
                                 'once': true

                             }],,

                             'image': {

                                 'driver': 'null-co'

                                 'driver': 'file',,

                                 'filename': 'TEST_DIR/t.IMGFMT.base'

                             }}}

wrote 65536/65536 bytes at offset 0

64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)