From: Max Reitz Date: Tue, 20 May 2014 20:43:19 +0000 (+0200) Subject: iotests: Use _img_info in test 089 X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0bf7488afbf42ccde75eb390afe5ea494c47f0c9;p=qemu.git iotests: Use _img_info in test 089 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 Reported-by: Kevin Wolf Signed-off-by: Stefan Hajnoczi --- diff --git a/tests/qemu-iotests/089 b/tests/qemu-iotests/089 index ef476010c0..dffc977e1c 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 d6cf7835d8..4ca2f88e6a 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 ===