From nobody Tue Nov 18 12:59:31 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.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=1610547219; cv=none; d=zohomail.com; s=zohoarc; b=KTXKHRVCJ4r4NvtATmyH5GDzjqB1NY0ezF6tqB18x3YTDJ6wlxYf8BB8Au9e865hVDa86TwWu1S5A53YONQpe7ZN4jVQ4sQc1ihlntRyCWO8l9ekdqcOySFnicccJZrgvVLDk9s2kwDFwdZUKtvOnae9qH2OrzorCjn3Uxt6nFs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610547219; h=Content-Type: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; bh=8wVzC6ffuITIYM6IDI3NSRuUJY83RIeiLDhbbng4Fjk=; b=lJLAd72ZyKUqkifpMAVfezOvAnipCS/uKmhuYOeSVq0IqXSIez73QR9gDOh2qjBsmtzBsvPfAK7/VHkFGWuhV5kKpbNOpnFx4k5OSA4TadjZqUYg+/fN5buf5DOudmMAphtTrJJHHfEu0IzOdQS0cWWqodl/yXkF2xP4WNgNvbA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 1610547219658517.3833005823843; Wed, 13 Jan 2021 06:13:39 -0800 (PST) Received: from localhost ([::1]:51118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzgu2-0000tT-DS for importer@patchew.org; Wed, 13 Jan 2021 09:13:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48984) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzgnE-0002wz-Mu for qemu-devel@nongnu.org; Wed, 13 Jan 2021 09:06:39 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:38654) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kzgn2-0003Xz-St for qemu-devel@nongnu.org; Wed, 13 Jan 2021 09:06:27 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-218-zd5_d3FOO9GVcaz9sR3vKQ-1; Wed, 13 Jan 2021 09:06:21 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 484CC803659; Wed, 13 Jan 2021 14:06:20 +0000 (UTC) Received: from localhost (ovpn-113-103.ams2.redhat.com [10.36.113.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DCFCE5D9EF; Wed, 13 Jan 2021 14:06:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610546782; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8wVzC6ffuITIYM6IDI3NSRuUJY83RIeiLDhbbng4Fjk=; b=WAepuixMi7VTatIog0+BloLiC/4v1BkVG4So3uZG5BPBjIpT6bRCfqBB4oI20OXwSD/Vm8 bHEA7EN5fCdw4lAJdcdOI+mEWMEI9Tu/QcF8Aacd40t0lU+m4/ukQ4ELdxWJg6GNuRySC+ 5isIpAw6BHtfHY15GW5Vq9gKjM7QHck= X-MC-Unique: zd5_d3FOO9GVcaz9sR3vKQ-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 1/7] iotests: Move try_remove to iotests.py Date: Wed, 13 Jan 2021 15:06:10 +0100 Message-Id: <20210113140616.150283-2-mreitz@redhat.com> In-Reply-To: <20210113140616.150283-1-mreitz@redhat.com> References: <20210113140616.150283-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mreitz@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=63.128.21.124; envelope-from=mreitz@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action 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 , Vladimir Sementsov-Ogievskiy , qemu-devel@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- tests/qemu-iotests/124 | 8 +------- tests/qemu-iotests/iotests.py | 11 +++++++---- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/tests/qemu-iotests/124 b/tests/qemu-iotests/124 index 3705cbb6b3..e40eeb50b9 100755 --- a/tests/qemu-iotests/124 +++ b/tests/qemu-iotests/124 @@ -22,6 +22,7 @@ =20 import os import iotests +from iotests import try_remove =20 =20 def io_write_patterns(img, patterns): @@ -29,13 +30,6 @@ def io_write_patterns(img, patterns): iotests.qemu_io('-c', 'write -P%s %s %s' % pattern, img) =20 =20 -def try_remove(img): - try: - os.remove(img) - except OSError: - pass - - def transaction_action(action, **kwargs): return { 'type': action, diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index dcdcd0387f..15704ca466 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -515,12 +515,15 @@ class FilePath: return False =20 =20 +def try_remove(img): + try: + os.remove(img) + except OSError: + pass + def file_path_remover(): for path in reversed(file_path_remover.paths): - try: - os.remove(path) - except OSError: - pass + try_remove(path) =20 =20 def file_path(*names, base_dir=3Dtest_dir): --=20 2.29.2