Patchwork [v3,7/7] iotests: Test qemu-img convert -C --salvage

login
register
mail settings
Submitter Max Reitz
Date April 13, 2019, 4:53 p.m.
Message ID <20190413165343.9018-8-mreitz@redhat.com>
Download mbox | patch
Permalink /patch/772477/
State New
Headers show

Comments

Max Reitz - April 13, 2019, 4:53 p.m.
We do not support this combination (yet), so this should yield an error
message.

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/082     | 1 +
 tests/qemu-iotests/082.out | 3 +++
 2 files changed, 4 insertions(+)
Vladimir Sementsov-Ogievskiy - April 16, 2019, 8:13 a.m.
13.04.2019 19:53, Max Reitz wrote:
> We do not support this combination (yet), so this should yield an error

> message.

> 

> Signed-off-by: Max Reitz <mreitz@redhat.com>


Tested-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

            [only -qcow2, as -nfs -qcow2 is already broken]
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>


Hmm, interesting, that this test is defined as
_supported_fmt qcow2
_supported_proto file nfs

And of course, it doesn't work for -qcow2 -nfs combination..

> ---

>   tests/qemu-iotests/082     | 1 +

>   tests/qemu-iotests/082.out | 3 +++

>   2 files changed, 4 insertions(+)

> 

> diff --git a/tests/qemu-iotests/082 b/tests/qemu-iotests/082

> index d0afa46e9a..c58b37127f 100755

> --- a/tests/qemu-iotests/082

> +++ b/tests/qemu-iotests/082

> @@ -163,6 +163,7 @@ echo === convert: -C and other options ===

>   run_qemu_img convert -C -S 4k -O $IMGFMT "$TEST_IMG" "$TEST_IMG".target

>   run_qemu_img convert -C -S 8k -O $IMGFMT "$TEST_IMG" "$TEST_IMG".target

>   run_qemu_img convert -C -c -O $IMGFMT "$TEST_IMG" "$TEST_IMG".target

> +run_qemu_img convert -C --salvage -O $IMGFMT "$TEST_IMG" "$TEST_IMG".target

>   

>   echo

>   echo === amend: Options specified more than once ===

> diff --git a/tests/qemu-iotests/082.out b/tests/qemu-iotests/082.out

> index d36938da9b..9d4f7574c9 100644

> --- a/tests/qemu-iotests/082.out

> +++ b/tests/qemu-iotests/082.out

> @@ -555,6 +555,9 @@ qemu-img: Cannot enable copy offloading when -S is used

>   Testing: convert -C -c -O qcow2 TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.target

>   qemu-img: Cannot enable copy offloading when -c is used

>   

> +Testing: convert -C --salvage -O qcow2 TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.target

> +qemu-img: Cannot use copy offloading in salvaging mode

> +

>   === amend: Options specified more than once ===

>   

>   Testing: amend -f foo -f qcow2 -o lazy_refcounts=on TEST_DIR/t.qcow2

> 



-- 
Best regards,
Vladimir
Max Reitz - April 17, 2019, 4:43 p.m.
On 16.04.19 10:13, Vladimir Sementsov-Ogievskiy wrote:
> 13.04.2019 19:53, Max Reitz wrote:
>> We do not support this combination (yet), so this should yield an error
>> message.
>>
>> Signed-off-by: Max Reitz <mreitz@redhat.com>
> 
> Tested-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
>             [only -qcow2, as -nfs -qcow2 is already broken]
> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
> 
> Hmm, interesting, that this test is defined as
> _supported_fmt qcow2
> _supported_proto file nfs
> 
> And of course, it doesn't work for -qcow2 -nfs combination..

Of course, nobody ever tests nfs. :-)

Thanks for reviewing!

Max

Patch

diff --git a/tests/qemu-iotests/082 b/tests/qemu-iotests/082
index d0afa46e9a..c58b37127f 100755
--- a/tests/qemu-iotests/082
+++ b/tests/qemu-iotests/082
@@ -163,6 +163,7 @@  echo === convert: -C and other options ===
 run_qemu_img convert -C -S 4k -O $IMGFMT "$TEST_IMG" "$TEST_IMG".target
 run_qemu_img convert -C -S 8k -O $IMGFMT "$TEST_IMG" "$TEST_IMG".target
 run_qemu_img convert -C -c -O $IMGFMT "$TEST_IMG" "$TEST_IMG".target
+run_qemu_img convert -C --salvage -O $IMGFMT "$TEST_IMG" "$TEST_IMG".target
 
 echo
 echo === amend: Options specified more than once ===
diff --git a/tests/qemu-iotests/082.out b/tests/qemu-iotests/082.out
index d36938da9b..9d4f7574c9 100644
--- a/tests/qemu-iotests/082.out
+++ b/tests/qemu-iotests/082.out
@@ -555,6 +555,9 @@  qemu-img: Cannot enable copy offloading when -S is used
 Testing: convert -C -c -O qcow2 TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.target
 qemu-img: Cannot enable copy offloading when -c is used
 
+Testing: convert -C --salvage -O qcow2 TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.target
+qemu-img: Cannot use copy offloading in salvaging mode
+
 === amend: Options specified more than once ===
 
 Testing: amend -f foo -f qcow2 -o lazy_refcounts=on TEST_DIR/t.qcow2