From patchwork Tue Oct 1 19:46:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 1170228 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com 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 ozlabs.org (Postfix) with ESMTPS id 46jWqD5vm7z9sPc for ; Wed, 2 Oct 2019 06:59:36 +1000 (AEST) Received: from localhost ([::1]:48104 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFPF8-0007Ln-6t for incoming@patchwork.ozlabs.org; Tue, 01 Oct 2019 16:59:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55242) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFO93-0005ux-3x for qemu-devel@nongnu.org; Tue, 01 Oct 2019 15:49:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFO91-00007G-5M for qemu-devel@nongnu.org; Tue, 01 Oct 2019 15:49:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58824) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iFO8x-00005n-Hp; Tue, 01 Oct 2019 15:49:07 -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 CA03430860D5; Tue, 1 Oct 2019 19:49:06 +0000 (UTC) Received: from localhost (unknown [10.40.205.251]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 64E261001B08; Tue, 1 Oct 2019 19:49:06 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 47/67] iotests/218: Honor $IMGOPTS Date: Tue, 1 Oct 2019 21:46:55 +0200 Message-Id: <20191001194715.2796-48-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.44]); Tue, 01 Oct 2019 19:49:06 +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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Max Reitz --- tests/qemu-iotests/218 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/qemu-iotests/218 b/tests/qemu-iotests/218 index e18e31076b..6f6fe6588e 100755 --- a/tests/qemu-iotests/218 +++ b/tests/qemu-iotests/218 @@ -27,7 +27,7 @@ # Creator/Owner: Max Reitz import iotests -from iotests import log, qemu_img, qemu_io_silent +from iotests import log, create_test_image, qemu_io_silent iotests.script_initialize(supported_fmts=['qcow2', 'raw']) @@ -142,9 +142,9 @@ log('=== Cancel mirror job from throttled node by quitting ===') log('') with iotests.VM() as vm, \ - iotests.FilePath('src.img') as src_img_path: + iotests.ImagePath('src.img') as src_img_path: - assert qemu_img('create', '-f', iotests.imgfmt, src_img_path, '64M') == 0 + assert create_test_image(src_img_path, '64M') == 0 assert qemu_io_silent('-f', iotests.imgfmt, src_img_path, '-c', 'write -P 42 0M 64M') == 0