From nobody Mon Feb 9 11:33:20 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=1569960626; cv=none; d=zoho.com; s=zohoarc; b=kvOKMPqIaFla4uunDjldwV/X/rK+wes1PsOO440xlRzxGJpukXD+8x7yiK4/s9AdNySqpN6ulNFEZreCZSOjzTTvZLw+WnUvXqthAhzd+76Trc80+LDwdzoXIdWQSGdNcyGHxOWgQ9Bpg2siUSRkfwQEexq6+viTpysH0GZHHbc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569960626; 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=xNSPjhf3HdCNT1ixJaekdY9zQ8r7LavXqWlZ+OmlF9w=; b=eUqDJjMb1tpFHUl5BbiOnkr8i2xGfReW5vEt2s0ssnXAx/sDp7Q0IDkB/wsn2TRiScv76B6q1wF/73JawqPVtRWNGG7XYAHBor9aWRH0V5tvuT2ukDCm7x7aqbiAwpTUGHJHlzZXDF5jPOeABEuR7RpHcGGiMExjrK0tOniGBW8= 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 1569960626630347.0126339482804; Tue, 1 Oct 2019 13:10:26 -0700 (PDT) Received: from localhost ([::1]:47720 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFOTW-00075I-96 for importer@patchew.org; Tue, 01 Oct 2019 16:10:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53896) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFO7V-0004TX-07 for qemu-devel@nongnu.org; Tue, 01 Oct 2019 15:47:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFO7T-0007fp-JU for qemu-devel@nongnu.org; Tue, 01 Oct 2019 15:47:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44266) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iFO7O-0007dc-HN; Tue, 01 Oct 2019 15:47:30 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C4CEF2A09A1; Tue, 1 Oct 2019 19:47:29 +0000 (UTC) Received: from localhost (unknown [10.40.205.251]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5ED0260C5D; Tue, 1 Oct 2019 19:47:29 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 05/67] iotests.py: Add ImagePaths Date: Tue, 1 Oct 2019 21:46:13 +0200 Message-Id: <20191001194715.2796-6-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.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Tue, 01 Oct 2019 19:47:29 +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" create_test_image() must be paired with an ImagePath so that the image is properly cleaned up with remove_test_image() instead of just os.remove(). Signed-off-by: Max Reitz --- tests/qemu-iotests/iotests.py | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index fce1ab04c9..5be6ca674c 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -440,8 +440,8 @@ class FilePaths(object): Use this context manager to generate filenames and ensure that the file gets deleted:: =20 - with FilePaths(['test.img']) as img_path: - qemu_img('create', img_path, '1G') + with FilePaths(['migration.sock']) as migration_sock_path: + # Set up and use UNIX socket on migration.sock # migration_sock_path is automatically deleted """ def __init__(self, names): @@ -460,6 +460,23 @@ class FilePaths(object): pass return False =20 +class ImagePaths(FilePaths): + """ + Same as FilePaths, except it calls remove_test_image() to clean up + (which ensures that external data files are cleaned up, too). + + Use this class for test images in the default format + (iotests.imgfmt): + + with ImagePaths(['test.img']) as img_path: + create_test_image(img_path, '1G') + # The test image is automatically cleaned up + """ + def __exit__(self, exc_type, exc_val, exc_tb): + for path in self.paths: + remove_test_image(path) + return False + class FilePath(FilePaths): """ FilePath is a specialization of FilePaths that takes a single filename. @@ -470,6 +487,17 @@ class FilePath(FilePaths): def __enter__(self): return self.paths[0] =20 +class ImagePath(ImagePaths): + """ + ImagePath is a specialization of ImagePaths that takes a single + filename. + """ + def __init__(self, name): + super(ImagePath, self).__init__([name]) + + def __enter__(self): + return self.paths[0] + def file_path_remover(): for path in reversed(file_path_remover.paths): try: --=20 2.21.0