[v2] iotests: fix 197 for vpc

Message ID 20171205010820.27732-1-jsnow@redhat.com
State New
Headers show
Series
  • [v2] iotests: fix 197 for vpc
Related show

Commit Message

John Snow Dec. 5, 2017, 1:08 a.m.
VPC has some difficulty creating geometries of particular size.
However, we can indeed force it to use a literal one, so let's
do that for the sake of test 197, which is testing some specific
offsets.

Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 tests/qemu-iotests/197           | 4 ++++
 tests/qemu-iotests/common.filter | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

Comments

Lukáš Doktor Dec. 5, 2017, 9:05 a.m. | #1
Dne 5.12.2017 v 02:08 John Snow napsal(a):
> VPC has some difficulty creating geometries of particular size.
> However, we can indeed force it to use a literal one, so let's
> do that for the sake of test 197, which is testing some specific
> offsets.
> 
> Signed-off-by: John Snow <jsnow@redhat.com>
> Reviewed-by: Eric Blake <eblake@redhat.com>
> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
> ---
>  tests/qemu-iotests/197           | 4 ++++
>  tests/qemu-iotests/common.filter | 3 ++-
>  2 files changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197
> index 887eb4f496..5e869fe2b7 100755
> --- a/tests/qemu-iotests/197
> +++ b/tests/qemu-iotests/197
> @@ -60,6 +60,10 @@ echo '=== Copy-on-read ==='
>  echo
>  
>  # Prep the images
> +# VPC rounds image sizes to a specific geometry, force a specific size.
> +if [ "$IMGFMT" = "vpc" ]; then
> +    IMGOPTS=$(_optstr_add "$IMGOPTS" "force_size")
> +fi

Yep, the comment is helpful and it works well. (well "-nbd -vpc" fails, but that is another story)

Reviewed-by: Lukáš Doktor <ldoktor@redhat.com> 


>  _make_test_img 4G
>  $QEMU_IO -c "write -P 55 3G 1k" "$TEST_IMG" | _filter_qemu_io
>  IMGPROTO=file IMGFMT=qcow2 IMGOPTS= TEST_IMG_FILE="$TEST_WRAP" \
> diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
> index d9237799e9..f08248bfd9 100644
> --- a/tests/qemu-iotests/common.filter
> +++ b/tests/qemu-iotests/common.filter
> @@ -134,7 +134,8 @@ _filter_img_create()
>          -e "s# log_size=[0-9]\\+##g" \
>          -e "s# refcount_bits=[0-9]\\+##g" \
>          -e "s# key-secret=[a-zA-Z0-9]\\+##g" \
> -        -e "s# iter-time=[0-9]\\+##g"
> +        -e "s# iter-time=[0-9]\\+##g" \
> +        -e "s# force_size=\\(on\\|off\\)##g"
>  }
>  
>  _filter_img_info()
>
Kevin Wolf Dec. 8, 2017, 2:29 p.m. | #2
Am 05.12.2017 um 02:08 hat John Snow geschrieben:
> VPC has some difficulty creating geometries of particular size.
> However, we can indeed force it to use a literal one, so let's
> do that for the sake of test 197, which is testing some specific
> offsets.
> 
> Signed-off-by: John Snow <jsnow@redhat.com>
> Reviewed-by: Eric Blake <eblake@redhat.com>
> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

Thanks, applied to block-next.

Kevin

Patch

diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197
index 887eb4f496..5e869fe2b7 100755
--- a/tests/qemu-iotests/197
+++ b/tests/qemu-iotests/197
@@ -60,6 +60,10 @@  echo '=== Copy-on-read ==='
 echo
 
 # Prep the images
+# VPC rounds image sizes to a specific geometry, force a specific size.
+if [ "$IMGFMT" = "vpc" ]; then
+    IMGOPTS=$(_optstr_add "$IMGOPTS" "force_size")
+fi
 _make_test_img 4G
 $QEMU_IO -c "write -P 55 3G 1k" "$TEST_IMG" | _filter_qemu_io
 IMGPROTO=file IMGFMT=qcow2 IMGOPTS= TEST_IMG_FILE="$TEST_WRAP" \
diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
index d9237799e9..f08248bfd9 100644
--- a/tests/qemu-iotests/common.filter
+++ b/tests/qemu-iotests/common.filter
@@ -134,7 +134,8 @@  _filter_img_create()
         -e "s# log_size=[0-9]\\+##g" \
         -e "s# refcount_bits=[0-9]\\+##g" \
         -e "s# key-secret=[a-zA-Z0-9]\\+##g" \
-        -e "s# iter-time=[0-9]\\+##g"
+        -e "s# iter-time=[0-9]\\+##g" \
+        -e "s# force_size=\\(on\\|off\\)##g"
 }
 
 _filter_img_info()