From nobody Mon Feb 9 06:49:14 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=1569962250; cv=none; d=zoho.com; s=zohoarc; b=cEHeEur33LcoPOKs2muQD6mcNAEXgs5JOuSd3vwkBDD8SCYhT2Qf0mx3wR7gccHiCLCwGB8xCwhRWlrlGqVHP8qE8hTbqfk3peFnuTgZlJHOFLuJADJyAkWlKvVzP11+fxDPexZXKUWQB05O8/kbPSNf7NkmZuaSnM4bRB5tvkU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569962250; 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=HsP3/suMJuKJsNxhLilhPvMBNmC3kt1Tki/XZBWjEUw=; b=Mfw+WZkcC/6m+Ukb9X1fSHqbcj07xHUjJXoRfEv8gvoDnMV3FV56B25S1swZhN2jKFI7aZC3yaid6kUBPvuXXg75IaDXx3yq8I75WoIba5L6Gl6+Ss77XZhYn4gFwjMoJIarZA+ct02gnbnluBeSXJOobi7wgcxGlmtqSwz92/U= 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 1569962250558411.3273209621012; Tue, 1 Oct 2019 13:37:30 -0700 (PDT) Received: from localhost ([::1]:47902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFOtk-0003uQ-PH for importer@patchew.org; Tue, 01 Oct 2019 16:37:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54832) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFO8a-0005LR-Jv for qemu-devel@nongnu.org; Tue, 01 Oct 2019 15:48:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFO8Y-0008Id-J1 for qemu-devel@nongnu.org; Tue, 01 Oct 2019 15:48:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59876) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iFO8W-0008HE-0Z; Tue, 01 Oct 2019 15:48:40 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4370A18C4279; Tue, 1 Oct 2019 19:48:39 +0000 (UTC) Received: from localhost (unknown [10.40.205.251]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D0E835C1D4; Tue, 1 Oct 2019 19:48:38 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 35/67] iotests/163: Honor $IMGOPTS Date: Tue, 1 Oct 2019 21:46:43 +0200 Message-Id: <20191001194715.2796-36-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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.62]); Tue, 01 Oct 2019 19:48:39 +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/163 | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/tests/qemu-iotests/163 b/tests/qemu-iotests/163 index 92633f1b21..5c5e23f9fc 100755 --- a/tests/qemu-iotests/163 +++ b/tests/qemu-iotests/163 @@ -19,7 +19,8 @@ # =20 import os, random, iotests, struct, qcow2, sys -from iotests import qemu_img, qemu_io, image_size +from iotests import create_test_image, remove_test_image, qemu_img, qemu_i= o, \ + image_size =20 test_img =3D os.path.join(iotests.test_dir, 'test.img') check_img =3D os.path.join(iotests.test_dir, 'check.img') @@ -82,22 +83,19 @@ class ShrinkBaseClass(iotests.QMPTestCase): =20 def setUp(self): if iotests.imgfmt =3D=3D 'raw': - qemu_img('create', '-f', iotests.imgfmt, test_img, self.image_= len) - qemu_img('create', '-f', iotests.imgfmt, check_img, - self.shrink_size) + create_test_image(test_img, self.image_len) + create_test_image(check_img, self.shrink_size) else: - qemu_img('create', '-f', iotests.imgfmt, - '-o', 'cluster_size=3D' + self.cluster_size + - ',refcount_bits=3D' + self.refcount_bits, - test_img, self.image_len) - qemu_img('create', '-f', iotests.imgfmt, - '-o', 'cluster_size=3D%s'% self.cluster_size, - check_img, self.shrink_size) + create_test_image(test_img, self.image_len, + opts=3D['cluster_size=3D' + self.cluster_siz= e, + 'refcount_bits=3D' + self.refcount_bit= s]) + create_test_image(check_img, self.shrink_size, + opts=3D['cluster_size=3D' + self.cluster_siz= e]) qemu_io('-c', 'write -P 0xff 0 ' + self.shrink_size, check_img) =20 def tearDown(self): - os.remove(test_img) - os.remove(check_img) + remove_test_image(test_img) + remove_test_image(check_img) =20 def image_verify(self): self.assertEqual(image_size(test_img), image_size(check_img), --=20 2.21.0