On Wed, 12/03 14:57, Max Reitz wrote:
> Add a test for vmdk files which use a file with a JSON file name, and
> which then try to open extents. That should fail and the error message
> should at least try to look helpful.
>
> Signed-off-by: Max Reitz <mre...@redhat.com>
> ---
> tests/qemu-iotests/059 | 6 ++++++
> tests/qemu-iotests/059.out | 4 ++++
> 2 files changed, 10 insertions(+)
>
> diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059
> index 2ed1a7f..50ca5ce 100755
> --- a/tests/qemu-iotests/059
> +++ b/tests/qemu-iotests/059
> @@ -111,6 +111,12 @@ $QEMU_IO -f qcow2 -c "write -P 0xb 10240 512"
> "$TEST_IMG.qcow2" | _filter_qemu_i
> $QEMU_IMG convert -f qcow2 -O vmdk -o subformat=streamOptimized
> "$TEST_IMG.qcow2" "$TEST_IMG" 2>&1
>
> echo
> +echo "=== Testing monolithicFlat with internally generated JSON file name
> ==="
> +IMGOPTS="subformat=monolithicFlat" _make_test_img 64M
> +$QEMU_IO -c "open -o
> driver=$IMGFMT,file.driver=blkdebug,file.image.filename=$TEST_IMG,file.inject-error.0.event=read_aio"
> 2>&1 \
> + | _filter_testdir | _filter_imgfmt
> +
> +echo
> echo "=== Testing version 3 ==="
> _use_sample_img iotest-version3.vmdk.bz2
> _img_info
> diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out
> index 0dadba6..cbb0de4 100644
> --- a/tests/qemu-iotests/059.out
> +++ b/tests/qemu-iotests/059.out
> @@ -2053,6 +2053,10 @@ wrote 512/512 bytes at offset 0
> wrote 512/512 bytes at offset 10240
> 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
>
> +=== Testing monolithicFlat with internally generated JSON file name ===
> +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> +qemu-io: can't open: Cannot use relative extent paths with VMDK descriptor
> file 'json:{"image": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"},
> "driver": "blkdebug", "inject-error.0.event": "read_aio"}'
> +
> === Testing version 3 ===
> image: TEST_DIR/iotest-version3.IMGFMT
> file format: IMGFMT
> --
> 1.9.3
>
Reviewed-by: Fam Zheng <f...@redhat.com>
