From patchwork Tue Oct 1 19:46:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 1170173 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 46jVPV1x9Yz9sPh for ; Wed, 2 Oct 2019 05:55:41 +1000 (AEST) Received: from localhost ([::1]:47580 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFOFF-0002zG-UU for incoming@patchwork.ozlabs.org; Tue, 01 Oct 2019 15:55:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54074) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFO7k-0004XI-P4 for qemu-devel@nongnu.org; Tue, 01 Oct 2019 15:47:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFO7g-0007lC-Om for qemu-devel@nongnu.org; Tue, 01 Oct 2019 15:47:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59944) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iFO7Q-0007em-RJ; Tue, 01 Oct 2019 15:47:32 -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 1A80010C094A; Tue, 1 Oct 2019 19:47:32 +0000 (UTC) Received: from localhost (unknown [10.40.205.251]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A59395D6D0; Tue, 1 Oct 2019 19:47:31 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 06/67] iotests.py: Add image_path() Date: Tue, 1 Oct 2019 21:46:14 +0200 Message-Id: <20191001194715.2796-7-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.6.2 (mx1.redhat.com [10.5.110.66]); Tue, 01 Oct 2019 19:47:32 +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" Just like we have file_path() as an alternative to FilePath, this is an alternative fo ImagePath. Signed-off-by: Max Reitz --- tests/qemu-iotests/iotests.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 5be6ca674c..280e6c2ec2 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -505,8 +505,12 @@ def file_path_remover(): except OSError: pass +def image_path_remover(): + for path in reversed(image_path_remover.paths): + remove_test_image(path) -def file_path(*names): + +def file_path(*names, remover=file_path_remover): ''' Another way to get auto-generated filename that cleans itself up. Use is as simple as: @@ -515,19 +519,22 @@ def file_path(*names): sock = file_path('socket') ''' - if not hasattr(file_path_remover, 'paths'): - file_path_remover.paths = [] - atexit.register(file_path_remover) + if not hasattr(remover, 'paths'): + remover.paths = [] + atexit.register(remover) paths = [] for name in names: filename = file_pattern(name) path = os.path.join(test_dir, filename) - file_path_remover.paths.append(path) + remover.paths.append(path) paths.append(path) return paths[0] if len(paths) == 1 else paths +def image_path(*names): + return file_path(*names, remover=image_path_remover) + def remote_filename(path): if imgproto == 'file': return path