Re: [Qemu-block] [PATCH v2 2/2] block: test 'blockdev-snapshot' using a file BDS as the overlay

[Max Reitz]

On 02.11.2015 13:15, Alberto Garcia wrote:
> This test checks that it is not possible to create a snapshot using as
> the overlay node a BDS that does not support backing images.

I don't think that works in English. I may be wrong, of course.

"a snapshot using a BDS that does not support backing images as the
overlay node", "a snapshot with the overlay node being a BDS that...",
"a snapshot using a BDS as the overlay node that...", or something like
that might work.

> Signed-off-by: Alberto Garcia <address@hidden>
> ---
>  tests/qemu-iotests/085     | 12 +++++++++++-
>  tests/qemu-iotests/085.out |  4 ++++
>  2 files changed, 15 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085
> index 9484117..ccde2ae 100755
> --- a/tests/qemu-iotests/085
> +++ b/tests/qemu-iotests/085
> @@ -103,7 +103,8 @@ function add_snapshot_image()
>             { 'options':
>               { 'driver': 'qcow2', 'node-name': 'snap_"${1}"', 
> "${extra_params}"
>                 'file':
> -               { 'driver': 'file', 'filename': '"${snapshot_file}"' } } } }"
> +               { 'driver': 'file', 'filename': '"${snapshot_file}"',
> +                 'node-name': 'file_"${1}"' } } } }"

Pre-existing, but do those "" actually do anything?

Since the latter is mainly out of curiosity, and because English too not
my mother language is, which is why I not the one be should, who himself
over that complains*:

Reviewed-by: Max Reitz <address@hidden>

(Although I would indeed prefer the commit message to be parsable more
easily.)

*Man, writing that was hard.

>      _send_qemu_cmd $h "${cmd}" "return"
>  }
>  
> @@ -187,6 +188,15 @@ add_snapshot_image ${SNAPSHOTS}
>  blockdev_snapshot ${SNAPSHOTS}
>  
>  echo
> +echo === Invalid command - cannot create a snapshot using a file BDS ===
> +echo
> +
> +_send_qemu_cmd $h "{ 'execute': 'blockdev-snapshot',
> +                     'arguments': { 'node':'virtio0',
> +                                    'overlay':'file_"${SNAPSHOTS}"' }
> +                   }" "error"
> +
> +echo
>  echo === Invalid command - snapshot node used as active layer ===
>  echo
>  
> diff --git a/tests/qemu-iotests/085.out b/tests/qemu-iotests/085.out
> index 52292ea..01c78d6 100644
> --- a/tests/qemu-iotests/085.out
> +++ b/tests/qemu-iotests/085.out
> @@ -62,6 +62,10 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 
> backing_file=TEST_DIR/
>  {"return": {}}
>  {"return": {}}
>  
> +=== Invalid command - cannot create a snapshot using a file BDS ===
> +
> +{"error": {"class": "GenericError", "desc": "The snapshot does not support 
> backing images"}}
> +
>  === Invalid command - snapshot node used as active layer ===
>  
>  {"error": {"class": "GenericError", "desc": "The snapshot is already in use 
> by virtio0"}}
>

signature.asc
Description: OpenPGP digital signature