[Qemu-devel] [PATCH] iotests: Use _img_info in test 089

[Qemu-devel] [PATCH] iotests: Use _img_info in test 089

[Max Reitz]

Currently, test 089 uses $QEMU_IMG info manually in order to obtain the
according output. However, the iotests should generally use _img_info as
this filters out more irrelevant information such as the host image size
or format specific information. Therefore, test 089 should use _img_info
as well.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reported-by: Kevin Wolf <kwolf@redhat.com>
---
This is a follow-up patch for:
[PATCH v3 4/4] iotests: Add test for the JSON protocol
---
 tests/qemu-iotests/089     | 3 +--
 tests/qemu-iotests/089.out | 4 ----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/tests/qemu-iotests/089 b/tests/qemu-iotests/089
index ef47601..dffc977 100755
--- a/tests/qemu-iotests/089
+++ b/tests/qemu-iotests/089
@@ -107,8 +107,7 @@ echo
 echo "=== Testing qemu-img info output ==="
 echo
 
-$QEMU_IMG info "json:{\"driver\":\"qcow2\",\"file.filename\":\"$TEST_IMG\"}" \
-    | _filter_testdir | _filter_imgfmt
+TEST_IMG="json:{\"driver\":\"qcow2\",\"file.filename\":\"$TEST_IMG\"}" _img_info
 
 
 echo
diff --git a/tests/qemu-iotests/089.out b/tests/qemu-iotests/089.out
index d6cf783..4ca2f88 100644
--- a/tests/qemu-iotests/089.out
+++ b/tests/qemu-iotests/089.out
@@ -31,11 +31,7 @@ read failed: Input/output error
 image: TEST_DIR/t.IMGFMT
 file format: IMGFMT
 virtual size: 64M (67108864 bytes)
-disk size: 324K
 cluster_size: 65536
-Format specific information:
-    compat: 1.1
-    lazy refcounts: false
 
 === Testing option merging ===
 
-- 
1.9.3

Re: [Qemu-devel] [PATCH] iotests: Use _img_info in test 089

[Stefan Hajnoczi]

On Tue, May 20, 2014 at 10:43:19PM +0200, Max Reitz wrote:
> Currently, test 089 uses $QEMU_IMG info manually in order to obtain the
> according output. However, the iotests should generally use _img_info as
> this filters out more irrelevant information such as the host image size
> or format specific information. Therefore, test 089 should use _img_info
> as well.
> 
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> Reported-by: Kevin Wolf <kwolf@redhat.com>
> ---
> This is a follow-up patch for:
> [PATCH v3 4/4] iotests: Add test for the JSON protocol
> ---
>  tests/qemu-iotests/089     | 3 +--
>  tests/qemu-iotests/089.out | 4 ----
>  2 files changed, 1 insertion(+), 6 deletions(-)

Thanks, applied to my block tree:
https://github.com/stefanha/qemu/commits/block

Stefan