From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D06B0C352AA for ; Tue, 1 Oct 2019 20:44:34 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9B18620842 for ; Tue, 1 Oct 2019 20:44:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9B18620842 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:47966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFP0a-0003Ll-Ml for qemu-devel@archiver.kernel.org; Tue, 01 Oct 2019 16:44:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55397) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFO9F-0006E9-DZ for qemu-devel@nongnu.org; Tue, 01 Oct 2019 15:49:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFO9E-0000Fo-3e for qemu-devel@nongnu.org; Tue, 01 Oct 2019 15:49:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41722) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iFO99-0000CQ-4v; Tue, 01 Oct 2019 15:49:20 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 664DC308FFB1; Tue, 1 Oct 2019 19:49:18 +0000 (UTC) Received: from localhost (unknown [10.40.205.251]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F29041001B05; Tue, 1 Oct 2019 19:49:17 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 52/67] iotests/234: Honor $IMGOPTS Date: Tue, 1 Oct 2019 21:47:00 +0200 Message-Id: <20191001194715.2796-53-mreitz@redhat.com> In-Reply-To: <20191001194715.2796-1-mreitz@redhat.com> References: <20191001194715.2796-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Tue, 01 Oct 2019 19:49:18 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Max Reitz --- tests/qemu-iotests/234 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/qemu-iotests/234 b/tests/qemu-iotests/234 index 3de6ab2341..f200af3f27 100755 --- a/tests/qemu-iotests/234 +++ b/tests/qemu-iotests/234 @@ -21,19 +21,20 @@ # that is built with individually created nodes =20 import iotests +from iotests import create_test_image import os =20 iotests.script_initialize(supported_fmts=3D['qcow2']) =20 -with iotests.FilePath('img') as img_path, \ - iotests.FilePath('backing') as backing_path, \ +with iotests.ImagePath('img') as img_path, \ + iotests.ImagePath('backing') as backing_path, \ iotests.FilePath('mig_fifo_a') as fifo_a, \ iotests.FilePath('mig_fifo_b') as fifo_b, \ iotests.VM(path_suffix=3D'a') as vm_a, \ iotests.VM(path_suffix=3D'b') as vm_b: =20 - iotests.qemu_img_pipe('create', '-f', iotests.imgfmt, backing_path, = '64M') - iotests.qemu_img_pipe('create', '-f', iotests.imgfmt, img_path, '64M= ') + create_test_image(backing_path, '64M') + create_test_image(img_path, '64M') =20 os.mkfifo(fifo_a) os.mkfifo(fifo_b) --=20 2.21.0