On 7/25/19 11:57 AM, Max Reitz wrote:
> We had a test for a case where relative extent paths did not work, but
> unfortunately we just fixed the underlying problem, so it works now.
> This patch adds a new test case that still fails.
>
> Signed-off-by: Max Reitz <mre...@redhat.com>
> ---
> tests/qemu-iotests/059 | 27 +++++++++++++++++++++++++++
> tests/qemu-iotests/059.out | 4 ++++
> 2 files changed, 31 insertions(+)
>
> diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059
> index fbed5f9483..2a883d0f21 100755
> --- a/tests/qemu-iotests/059
> +++ b/tests/qemu-iotests/059
> @@ -114,6 +114,8 @@ $QEMU_IMG convert -f qcow2 -O vmdk -o
> subformat=streamOptimized "$TEST_IMG.qcow2
>
> echo
> echo "=== Testing monolithicFlat with internally generated JSON file name
> ==="
> +
> +echo '--- blkdebug ---'
> # Should work, because bdrv_dirname() works fine with blkdebug
^
> 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"
> \
> @@ -122,6 +124,31 @@ $QEMU_IO -c "open -o
> driver=$IMGFMT,file.driver=blkdebug,file.image.filename=$TE
> | _filter_testdir | _filter_imgfmt | _filter_img_info
> _cleanup_test_img
>
> +echo '--- quorum ---'
> +# Should not work, because bdrv_dirname() does not work with blkdebug
^ ? So uh, which is it?
(you wanted: s/blkdebug/quorum/)
> +IMGOPTS="subformat=monolithicFlat" _make_test_img 64M
> +cp "$TEST_IMG" "$TEST_IMG.orig"
> +
> +filename="json:{
> + \"driver\": \"$IMGFMT\",
> + \"file\": {
> + \"driver\": \"quorum\",
> + \"children\": [ {
> + \"driver\": \"file\",
> + \"filename\": \"$TEST_IMG\"
> + }, {
> + \"driver\": \"file\",
> + \"filename\": \"$TEST_IMG.orig\"
> + } ],
> + \"vote-threshold\": 1
> + } }"
> +
> +filename=$(echo "$filename" | tr '\n' ' ' | sed -e 's/\s\+/ /g')
> +$QEMU_IMG info "$filename" 2>&1 \
> + | sed -e "s/'json:[^']*'/\$QUORUM_FILE/g" \
> + | _filter_testdir | _filter_imgfmt | _filter_img_info
> +
> +
> echo
> echo "=== Testing version 3 ==="
> _use_sample_img iotest-version3.vmdk.bz2
> diff --git a/tests/qemu-iotests/059.out b/tests/qemu-iotests/059.out
> index 120cddd207..f8895ba434 100644
> --- a/tests/qemu-iotests/059.out
> +++ b/tests/qemu-iotests/059.out
> @@ -2049,10 +2049,14 @@ 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 ===
> +--- blkdebug ---
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> format name: IMGFMT
> cluster size: 0 bytes
> vm state offset: 0 bytes
> +--- quorum ---
> +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> +qemu-img: Could not open $QUORUM_FILE: Cannot use relative paths with VMDK
> descriptor file $QUORUM_FILE: Cannot generate a base directory for quorum
> nodes
>
> === Testing version 3 ===
> image: TEST_DIR/iotest-version3.IMGFMT
>
With the paste-o fixed:
Reviewed-by: John Snow <js...@redhat.com>
