From nobody Mon Feb 9 12:26:00 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1569967068; cv=none; d=zoho.com; s=zohoarc; b=LiPwKSHdHRSTV+RQjaBUKq3TgO5oBKo2IYsQ/XolM5vlXQfjip5ZSIPJHxUnB1npzmVGmFfvJ1nfBKNzzt1b4Js+1ngx2++FaM74f2UdJl1146vzKlnUhprZ8woAiMZXg/zhU0+liE+t6sBlbwXN2tjM5VASpuB1NFgEqh3n6yM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569967068; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=sMjFILybXthGFlxpmSAb8kBCXwWkdEVKTL9mDlYamqU=; b=cXw1XybbLuYe9plW3qkyENsrSDjpx6Ylhf9gRfkedfcTpBDY23zfUTqAYECv7JgngttZaQvLj65RlhvrzOg115Z1w+xcEQ42jtHBr5NRQdxEDwiCNuKgK6UnDIQ4BlDb0Ou3tBy5JBg8PyfHXBL8csnVupnlmk5XZcGYiAt7RSg= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1569967068340213.18619084410113; Tue, 1 Oct 2019 14:57:48 -0700 (PDT) Received: from localhost ([::1]:48642 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFQ9S-0007qy-DJ for importer@patchew.org; Tue, 01 Oct 2019 17:57:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55672) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFO9h-0006j6-DT for qemu-devel@nongnu.org; Tue, 01 Oct 2019 15:49:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFO9g-0000UY-A7 for qemu-devel@nongnu.org; Tue, 01 Oct 2019 15:49:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35854) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iFO9d-0000S3-ML; Tue, 01 Oct 2019 15:49:49 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CE8B8C0546F1; Tue, 1 Oct 2019 19:49:47 +0000 (UTC) Received: from localhost (unknown [10.40.205.251]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 69C9160623; Tue, 1 Oct 2019 19:49:47 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 64/67] iotests/258: Honor $IMGOPTS Date: Tue, 1 Oct 2019 21:47:12 +0200 Message-Id: <20191001194715.2796-65-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.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 01 Oct 2019 19:49:47 +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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Max Reitz --- tests/qemu-iotests/258 | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/qemu-iotests/258 b/tests/qemu-iotests/258 index 1372522c7a..3e9505d8d4 100755 --- a/tests/qemu-iotests/258 +++ b/tests/qemu-iotests/258 @@ -20,7 +20,7 @@ # Creator/Owner: Max Reitz =20 import iotests -from iotests import log, qemu_img, qemu_io_silent, \ +from iotests import log, create_test_image, qemu_io_silent, \ filter_qmp_testfiles, filter_qmp_imgfmt =20 # Returns a node for blockdev-add @@ -65,22 +65,22 @@ def test_concurrent_finish(write_to_stream_node): # and the other way around, depending on whether the commit job # is finalized before stream completes or not. =20 - with iotests.FilePath('node4.img') as node4_path, \ - iotests.FilePath('node3.img') as node3_path, \ - iotests.FilePath('node2.img') as node2_path, \ - iotests.FilePath('node1.img') as node1_path, \ - iotests.FilePath('node0.img') as node0_path, \ + with iotests.ImagePath('node4.img') as node4_path, \ + iotests.ImagePath('node3.img') as node3_path, \ + iotests.ImagePath('node2.img') as node2_path, \ + iotests.ImagePath('node1.img') as node1_path, \ + iotests.ImagePath('node0.img') as node0_path, \ iotests.VM() as vm: =20 # It is important to use raw for the base layer (so that # permissions are just handed through to the protocol layer) - assert qemu_img('create', '-f', 'raw', node0_path, '64M') =3D=3D 0 + assert create_test_image(node0_path, '64M', fmt=3D'raw') =3D=3D 0 =20 stream_throttle=3DNone commit_throttle=3DNone =20 for path in [node1_path, node2_path, node3_path, node4_path]: - assert qemu_img('create', '-f', iotests.imgfmt, path, '64M') = =3D=3D 0 + assert create_test_image(path, '64M') =3D=3D 0 =20 if write_to_stream_node: # This is what (most of the time) makes commit finish --=20 2.21.0