motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-31 14:02:05 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

iotests: Fix 020 for vmdk

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

Reported-by: John Snow <jsnow@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20171123020832.8165-11-mreitz@redhat.com
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Max Reitz 2017-11-23 03:08:25 +01:00
parent a03a57a0f9
commit 8c97fcf4fe
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tests/qemu-iotests/020
View file

@ -111,10 +111,12 @@ echo
echo 'Testing failing commit' echo 'Testing failing commit'
echo echo
TEST_IMG="$TEST_IMG.base" _make_test_img 1M
# Create an image with a null backing file to which committing will fail (with # 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 # ENOSPC so we can distinguish the result from some generic EIO which may be
# generated anywhere in the block layer) # generated anywhere in the block layer)
_make_test_img -b "json:{'driver': 'raw', _make_test_img -b "json:{'driver': '$IMGFMT',
'file': { 'file': {
'driver': 'blkdebug', 'driver': 'blkdebug',
'inject-error': [{ 'inject-error': [{
@ -123,14 +125,15 @@ _make_test_img -b "json:{'driver': 'raw',
'once': true 'once': true
}], }],
'image': { 'image': {
'driver': 'null-co' 'driver': 'file',
'filename': '$TEST_IMG.base'
}}}" }}}"
# Just write anything so committing will not be a no-op # Just write anything so committing will not be a no-op
$QEMU_IO -c 'writev 0 64k' "$TEST_IMG" | _filter_qemu_io $QEMU_IO -c 'writev 0 64k' "$TEST_IMG" | _filter_qemu_io
$QEMU_IMG commit "$TEST_IMG" $QEMU_IMG commit "$TEST_IMG"
_cleanup_test_img _cleanup
# success, all done # success, all done
echo "*** done" echo "*** done"

6
tests/qemu-iotests/020.out
View file

@ -1078,7 +1078,8 @@ No errors were found on the image.
Testing failing commit 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': { 'file': {
'driver': 'blkdebug',, 'driver': 'blkdebug',,
'inject-error': [{ 'inject-error': [{
@ -1087,7 +1088,8 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824 backing_file=json:{'d
'once': true 'once': true
}],, }],,
'image': { 'image': {
'driver': 'null-co' 'driver': 'file',,
'filename': 'TEST_DIR/t.IMGFMT.base'
}}} }}}
wrote 65536/65536 bytes at offset 0 wrote 65536/65536 bytes at offset 0
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)