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 5AA62C352AA for ; Tue, 1 Oct 2019 20:38:58 +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 3069720842 for ; Tue, 1 Oct 2019 20:38:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3069720842 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]:47922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFOvA-0005tk-6P for qemu-devel@archiver.kernel.org; Tue, 01 Oct 2019 16:38:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55201) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFO8w-0005me-MF for qemu-devel@nongnu.org; Tue, 01 Oct 2019 15:49:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFO8v-00004y-EY for qemu-devel@nongnu.org; Tue, 01 Oct 2019 15:49:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33804) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iFO8t-0008V9-6g; Tue, 01 Oct 2019 15:49:03 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3AB73309BF02; Tue, 1 Oct 2019 19:49:02 +0000 (UTC) Received: from localhost (unknown [10.40.205.251]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C45945D6D0; Tue, 1 Oct 2019 19:49:01 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 45/67] iotests/208: Honor $IMGOPTS Date: Tue, 1 Oct 2019 21:46:53 +0200 Message-Id: <20191001194715.2796-46-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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Tue, 01 Oct 2019 19:49:02 +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/209 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/qemu-iotests/209 b/tests/qemu-iotests/209 index a77f884166..eb1215afd7 100755 --- a/tests/qemu-iotests/209 +++ b/tests/qemu-iotests/209 @@ -19,15 +19,16 @@ # =20 import iotests -from iotests import qemu_img_create, qemu_io, qemu_img_verbose, qemu_nbd= , \ - file_path +from iotests import create_test_image, qemu_io, qemu_img_verbose, qemu_n= bd, \ + file_path, image_path =20 iotests.script_initialize(supported_fmts=3D['qcow2']) =20 -disk, nbd_sock =3D file_path('disk', 'nbd-sock') +nbd_sock =3D file_path('nbd-sock') +disk =3D image_path('disk') nbd_uri =3D 'nbd+unix:///exp?socket=3D' + nbd_sock =20 -qemu_img_create('-f', iotests.imgfmt, disk, '1M') +create_test_image(disk, '1M') qemu_io('-f', iotests.imgfmt, '-c', 'write 0 512K', disk) =20 qemu_nbd('-k', nbd_sock, '-x', 'exp', '-f', iotests.imgfmt, disk) --=20 2.21.0