From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60329) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WnrcC-0005GZ-AB for qemu-devel@nongnu.org; Fri, 23 May 2014 11:42:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Wnrc3-0006BH-Rr for qemu-devel@nongnu.org; Fri, 23 May 2014 11:42:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18035) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wnrc3-0006A1-Jd for qemu-devel@nongnu.org; Fri, 23 May 2014 11:42:27 -0400 From: Stefan Hajnoczi Date: Fri, 23 May 2014 17:41:37 +0200 Message-Id: <1400859725-31879-6-git-send-email-stefanha@redhat.com> In-Reply-To: <1400859725-31879-1-git-send-email-stefanha@redhat.com> References: <1400859725-31879-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 05/33] iotests: Use _img_info in test 089 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefan Hajnoczi , Max Reitz From: 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 Reported-by: Kevin Wolf Signed-off-by: Stefan Hajnoczi --- 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.0