aboutsummaryrefslogtreecommitdiff
path: root/tests/qemu-iotests/020
diff options
context:
space:
mode:
authorMax Reitz <mreitz@redhat.com>2017-11-23 03:08:25 +0100
committerMax Reitz <mreitz@redhat.com>2018-01-23 12:34:43 +0100
commit8c97fcf4fe2e1d2bfe79053a5c3275c1c205ac28 (patch)
tree880fbf485e9f2a8e7d8ea343a9896315b4a03e57 /tests/qemu-iotests/020
parenta03a57a0f9ff4cc405ca7644d965154afe1ac51e (diff)
downloadqemu-8c97fcf4fe2e1d2bfe79053a5c3275c1c205ac28.zip
qemu-8c97fcf4fe2e1d2bfe79053a5c3275c1c205ac28.tar.gz
qemu-8c97fcf4fe2e1d2bfe79053a5c3275c1c205ac28.tar.bz2
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: 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>
Diffstat (limited to 'tests/qemu-iotests/020')
-rwxr-xr-xtests/qemu-iotests/0209
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020
index d22ab81..eac5080 100755
--- a/tests/qemu-iotests/020
+++ b/tests/qemu-iotests/020
@@ -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"