From patchwork Tue Oct 1 19:47:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 11169717 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8E56013B1 for ; Tue, 1 Oct 2019 21:13:15 +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 6E4312133F for ; Tue, 1 Oct 2019 21:13:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6E4312133F 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:48234 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFPSL-0003Rr-PA for patchwork-qemu-devel@patchwork.kernel.org; Tue, 01 Oct 2019 17:13:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55624) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFO9f-0006fr-6o for qemu-devel@nongnu.org; Tue, 01 Oct 2019 15:49:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFO9d-0000Se-Rj for qemu-devel@nongnu.org; Tue, 01 Oct 2019 15:49:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33540) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iFO9Z-0000Pd-Ag; Tue, 01 Oct 2019 15:49:45 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3EBED307D931; Tue, 1 Oct 2019 19:49:43 +0000 (UTC) Received: from localhost (unknown [10.40.205.251]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CC9A160C5D; Tue, 1 Oct 2019 19:49:42 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 62/67] iotests/256: Honor $IMGOPTS Date: Tue, 1 Oct 2019 21:47:10 +0200 Message-Id: <20191001194715.2796-63-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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Tue, 01 Oct 2019 19:49:43 +0000 (UTC) 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Max Reitz --- tests/qemu-iotests/256 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/qemu-iotests/256 b/tests/qemu-iotests/256 index d2f9212e5a..7c78a123ad 100755 --- a/tests/qemu-iotests/256 +++ b/tests/qemu-iotests/256 @@ -21,13 +21,13 @@ import os import iotests -from iotests import log +from iotests import log, create_test_image iotests.script_initialize(supported_fmts=['qcow2']) size = 64 * 1024 * 1024 -with iotests.FilePath('img0') as img0_path, \ - iotests.FilePath('img1') as img1_path, \ +with iotests.ImagePath('img0') as img0_path, \ + iotests.ImagePath('img1') as img1_path, \ iotests.FilePath('img0-full') as img0_full_path, \ iotests.FilePath('img1-full') as img1_full_path, \ iotests.FilePath('img0-incr') as img0_incr_path, \ @@ -62,8 +62,8 @@ with iotests.FilePath('img0') as img0_path, \ vm.add_object('iothread,id=iothread1') vm.add_device('virtio-scsi-pci,id=scsi0,iothread=iothread0') vm.add_device('virtio-scsi-pci,id=scsi1,iothread=iothread1') - iotests.qemu_img_create('-f', iotests.imgfmt, img0_path, str(size)) - iotests.qemu_img_create('-f', iotests.imgfmt, img1_path, str(size)) + create_test_image(img0_path, size) + create_test_image(img1_path, size) vm.add_drive(img0_path, interface='none') vm.add_device('scsi-hd,id=device0,drive=drive0,bus=scsi0.0') vm.add_drive(img1_path, interface='none')