From nobody Fri Oct 24 22:15:00 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1518703646109347.9646747280228; Thu, 15 Feb 2018 06:07:26 -0800 (PST) Received: from localhost ([::1]:51555 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emKC4-0000BS-7U for importer@patchew.org; Thu, 15 Feb 2018 09:07:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51189) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1emJxX-0001sG-9N for qemu-devel@nongnu.org; Thu, 15 Feb 2018 08:52:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1emJxT-00011V-66 for qemu-devel@nongnu.org; Thu, 15 Feb 2018 08:52:23 -0500 Received: from mail-db5eur01on0094.outbound.protection.outlook.com ([104.47.2.94]:28352 helo=EUR01-DB5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1emJxS-0000zX-VL; Thu, 15 Feb 2018 08:52:19 -0500 Received: from vova-pc.sw.ru (195.214.232.6) by AM5PR0801MB2052.eurprd08.prod.outlook.com (2603:10a6:203:4c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.506.18; Thu, 15 Feb 2018 13:52:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=6CeLpMBFZ1zJCSWbS8EAlGV2NosvclIp4O1aoZHPw5M=; b=GWFjkkYX9t4/lLO2WURYN1iDVgqTi68AsgFNiEzIh/ww9DfnbOBjQbYER7DWTnAmnbO3Yo3MXyETxwT3KiB5DCAy9/WdvqfQM24bGYaS6vnuG2bX45cgbje+x7r2DEApgmUMSC2pS0VtS95vBy/U9xZvTTWXcmYG1G4l5kmmgAc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=vsementsov@virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Thu, 15 Feb 2018 16:51:46 +0300 Message-Id: <1518702707-7077-9-git-send-email-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518702707-7077-1-git-send-email-vsementsov@virtuozzo.com> References: <1518702707-7077-1-git-send-email-vsementsov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR07CA0005.eurprd07.prod.outlook.com (2603:10a6:7:67::15) To AM5PR0801MB2052.eurprd08.prod.outlook.com (2603:10a6:203:4c::14) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6900800b-235f-46ab-b3cc-08d5747b5383 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(7168020)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:AM5PR0801MB2052; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB2052; 3:jq+NesHuTv7d0gl0G3ifWT5UVDeslIw8NPer4E9WKtk36H9szWsZRarErhR+9oH1BSJ8AISMPReCYuokJ9L+bggR2K6YCA4Mh2Psh2k3w5WebEF6SSfW/+9W/kqzitHljZVVPKskagjkWXeEI7sRJnOEwhf7TGRacaG0UMk+Pt0ZqNxupq0Eh1rJa/CbZbNR9KjbvUM7WrEQ1VJTMZJ7sMVFNzUjje/z1+5f1PsXh0kNiccntWwKMe3ytL5kugpv; 25:76RktuvWPg3sAcehcefwXn1YJLE2WwSzgMAkwnYttPSWxVEOkGQIWIYm5jxeCcovWqtOr2jMCDrBNvNhnrJYcUjfgowmBaa5qgD8T/Fp0bPNSNY2Uw9gRKhSRYhuMsWFHO6BVFVxKCvJyzb21RkbW6V6bheFB8yF/R7hrPNKutQJbz3vIkQCAy64zj5LytWvEGeCfxtXT/ylG1l22tkpFHVbchY4CiCnduTO5Piwzc8ozEa6BvJciTSITgrJtQyT02TT67qWjIcCfOL5JhXpPpCc8a4SeLNtpdmd6cZw2fGMHvvjzzFDC32L9XhRrDylqsPHVfs7cUg/gPoQWzuEEg==; 31:TNYydNlv6m/uf5gbrAva4R/WcwOQ7BuvceIvZ7226yXkhb9GG3m5mce0ybFUjnvcJAkHP+HnLTdpVaag8HX1M5x0RvjwT7kuLhemDZK0jS2I/7qg4+7XK2ipnTfB+RkEE4Od9WZWSag21IyrJHlGl+MH3r/VluY9juI+vAGpRJ5KOSOk9QsDf5NZp7WweP11OWidlv9cWs/q+QrGr5S9UytUCxCNNB5uUXLbC45BcjM= X-MS-TrafficTypeDiagnostic: AM5PR0801MB2052: X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB2052; 20:Xgd8oaeMS+URLS8in6YRDVxsW84PPLtIfUL8JtVPAyWlgmUuBK/kvR16jZOn9LO4lmUO+1OpStrv7oaRR4m6qmHfBtjIZmsMgo56CTHhu1gGhpRXBCKrimTzniAUjmaFAMtWgUq+h89MYtEt89BWSsxcPt97htPEOxINW7dq0vhn1ofr043KTqrN+2J9eNi1FWqMYsmB9H3LYLvy0YdalwUsh3EbRAktt8+ExdTM24IHiOklD/0rM0n7TqS8rEHcc/bMBWZfnHPqoqEcg5d8XOUoqzkGmmjaB+a09f2gcQ/+wglelwTFloC6U5+wj/SULXGCf4cy1mJCOiNqRl7mIg80u33AYu2FPRMwK3MLtLuX3w9P07MajmyBp6U7ip8+5+3Q69DUQhQJ2NU2oV54Nm5Y5seBfb0AVn+wczAQL5VBMJDUnwAYk1gUGIWDt5rocvegt0WijQWPOWCynGMkgSQmdtuYvp86xjH643fxkMdnQuYAt0NqCf4mNhCuQYsr; 4:Hmukpx2+MRsJ9ArzAUJYAqihxAoF2SdY7G5FXWOJ6XJ7zvKktWIoZDgJrU2QBgPgJxh0lD4N5MswYb9YD4SRSWQC1Y11RI55nQC65Hh1jQuktEL0Xo6JlSihknY5D5zbPNaCBDE1NIOgsroxGljebsWX4XTXV830f8k4lmkpVHqqPspRV+e1or7bP+Lv8mdJTxmvdWknn8kh+zq5oROi3OYzkB2X5QcBg71u45Y/kk8uOU0BxWmuaadQu+iq+np7ZQTEfsF3eVd8ynbi4sFvhQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(8121501046)(5005006)(10201501046)(3002001)(3231101)(944501161)(93006095)(93001095)(6041288)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123560045)(6072148)(201708071742011); SRVR:AM5PR0801MB2052; BCL:0; PCL:0; RULEID:; SRVR:AM5PR0801MB2052; X-Forefront-PRVS: 058441C12A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(396003)(39380400002)(376002)(346002)(39840400004)(366004)(189003)(199004)(105586002)(52116002)(305945005)(8676002)(81166006)(26005)(6512007)(51416003)(76176011)(5660300001)(81156014)(53936002)(25786009)(7736002)(97736004)(55236004)(16586007)(69596002)(6506007)(36756003)(47776003)(86362001)(66066001)(316002)(386003)(6486002)(106356001)(68736007)(50226002)(4326008)(53416004)(3846002)(2906002)(8936002)(478600001)(6116002)(16526019)(186003)(107886003)(48376002)(2950100002)(6666003)(50466002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:AM5PR0801MB2052; H:vova-pc.sw.ru; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM5PR0801MB2052; 23:m4C6wVrSSiRWiaJwAaMhikstwSampERGOkxYiWm?= =?us-ascii?Q?SWqxpADeLhLUg42o0V+70ps7/jzOwKhyzAgtktISTkTdhK+lZpXwoBdQWP6p?= =?us-ascii?Q?23dKz2JBZ4RyHxewXCznf6b3l+a3qEcatwBG2dayz7U0rpT3037Morr1XFnt?= =?us-ascii?Q?Du0+WGVhPxyUWGBUK7NjeekmOYYBegtDj+EolZOqAZN/kutSV/kG1oYBQSG6?= =?us-ascii?Q?FoiBXnJtdRmcPum+fSgocHmf0X9OlKLVhY2FOX6quM7793B7Ii4qJ3rfMD01?= =?us-ascii?Q?henfa/1dWsvmLcXBHc7KFxe2KfUeArZPXMl2UAgZnlJYWs9UxNPHuEkAHc1G?= =?us-ascii?Q?R7MRh696D9XJt7IFjJ4UuL3xRgUNgPqWDTBwR1nuaIJG/ZEk7jtDxb2Vc+0t?= =?us-ascii?Q?PwqQsGs7JhpV5mAROv3D7g/khjj2TlVS2J/oo86XvNk/S6BgAl32z48obIJk?= =?us-ascii?Q?0dMP6PYGSV8urIIZND7UgnQj2Hi+g3QZZShC0fur+v5UxrUSXy5oW65UtnP5?= =?us-ascii?Q?Ko0VHM5b7YNBpGHkdHEMR2yY6FNwrNeVvteVkCHLQBzVVrlJ/NlvXmyFmbf5?= =?us-ascii?Q?RNi9o7x/IotwT5jkbiD5R3LNwAeDpj7KRC0bc+JRk6Ubc+B6FwrjxtRupKSi?= =?us-ascii?Q?rIA7hD6tbswfhM/sfbAK6QjoOc7TiefA7V+wokfKDOHeOb5r1c23nO3eXQjE?= =?us-ascii?Q?wGHeF0bpomaJtf+MabxbEQ4a+gbRDtHoMTTlLoQ+50u/197HhPPlH/ZKogYy?= =?us-ascii?Q?lSPu3XBSzehAYR1tjBTZGkTR7VEkyeGaVc/x/Qi3vpZvrezb/TRfV47EFX1E?= =?us-ascii?Q?Alj1hzSO+tWvP3P7iuqsNPWPLkvf754kOnDmNBl2Ajngxm2bwxb6Ii2ejjFD?= =?us-ascii?Q?8U4z+pgYLFqXQCnC9IWZhE3LxyZKXaD//yP46vVrGvsc2BIEriFjwxKwkXLW?= =?us-ascii?Q?1L2M1Jt0xjyKILXyUnvHCboeYSRVrGcxqFDU/vZmFDNSE84d34tVi+TkTsLm?= =?us-ascii?Q?drDUV4h/tYUHsYfU/z/uXo9orJOIBpNW/5SEiONqqR28HQtNOYDts2DPVn+O?= =?us-ascii?Q?V8EFog2Lf1E80q6DXHn5KsXQ3ZqRbqM9WEXZJoBX8FBlz7D6LkMbG/uPKnbo?= =?us-ascii?Q?Mi/sb3nwCLlENVobpqeY/JOSs20i3RIXgtULtHHgr/1PLNjHA7Rx6xqKP51+?= =?us-ascii?Q?QooAstWA4Y/mJqhg=3D?= X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB2052; 6:GpDFbUZBGnOJCW39YaEol2iP9JhzYUCa/8PJHycvOXBnWcodHaHmcFTsvIpMLnS5jsQ0vGrLo9QScrwDcqah/lPAqR6d6qWrc64gyN1BQ7+SV9MVlTtJJ/ggHNLy1Ax/g57NpizAUBqhlrkTuVTeU4rzm1GzcSVLHhDLhtItkrIgjiNjtN5JcBJk1pTmXKX76XcrUDv9doOgHmdhJ30/kQRHeGCXEdIsu1sTKwAyZ+ek9o5ZNpKzSXY1UOCo8w/sCa7zeQ+dA01QPyK2swpGQ6gkQXRskwNTSmWZY2IloUBlMFbe/dkGwSJHRukQKNd2UzqJ8UkZINYy/Yr7zer60TGRquk7AMaNX8o5W+5sFeA=; 5:0ZfPsdqYoS4HUbXrt4bduNPEnTvJIceJL2FRE+a03cIj9ngE+jfUBM+4rm68pET87qLaWHVH1rG3cwyl8TeZer1KvWg8T27nTK+XMSx0ksMRfIHTcSYWDEskLUDxmeR2giLvx1H2ery+sEktEVxzkHybxnrzXIXbAHOZXMYJIUo=; 24:rr4wiw8zOHkpGbqcdaHE2H63ZmrbLb04ZnVLpqofGTEW4uudDHn76hBUeQH4VmPPDM/NnxR7io84Adt6iljDAAfNe3G6DBX8dBZOIa6RQHQ=; 7:ZU8J+lTxTXBKOQMw/5UYd7LeUyHZ4TmqARVqZoeCuGKmRKmn2NyYZNMmBZTtidP6rP+3klSzYQFelRu1JmqIAvMS+mgDXVpDR9i2yZKCpqYmDwnh7TJxobTM/Oyzeur8bPU6AomjCd8aNHlo9CiAhayeiRmI+czFBNST2B9yS/l6r1xnW/pt+u52TzDkvU9kpiswbR6AQDaVb8jjak25iO4BgDrUbJeAf5gm/KxO/XFgESg0GE9yfwQDNFH60oi5 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB2052; 20:0V5NzQZDgn/FpPNLJCD8fAwIeGeenUFOsBmiWHt7/7s+/BkamiE0aVupOM6fAQJPya85R5KkqFZXeg85ZQcD6qtvLzxVkuG/vEYVNwNA25AVip8eNS9UD3NdUIQE5WDMjMYH+Vs8PXCZibZjh6FePNnFHTvi4MyTaki2zsHIxQc= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2018 13:52:16.7951 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6900800b-235f-46ab-b3cc-08d5747b5383 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB2052 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.2.94 Subject: [Qemu-devel] [PATCH 8/9] iotests: add file_path helper X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, mreitz@redhat.com, den@openvz.org, pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Simple way to have auto generated filenames with auto clenup. Like FilePath but without using 'with' statement and without additional indentation of the whole test. Signed-off-by: Vladimir Sementsov-Ogievskiy --- tests/qemu-iotests/iotests.py | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index c1302a2f9b..f2d05ca3fd 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -27,6 +27,7 @@ import struct import json import signal import logging +import atexit =20 sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'scrip= ts')) import qtest @@ -250,6 +251,37 @@ class FilePath(object): return False =20 =20 +def file_path_remover(): + for path in reversed(file_path_remover.paths): + try: + os.remove(path) + except OSError: + pass + + +def file_path(*names): + ''' Another way to get auto-generated filename that cleans itself up. + + Use it as simple as: + + img_a, img_b =3D file_path('a.img', 'b.img') + sock =3D file_path('socket') + ''' + + if not hasattr(file_path_remover, 'paths'): + file_path_remover.paths =3D [] + atexit.register(file_path_remover) + + paths =3D [] + for name in names: + filename =3D '{0}-{1}'.format(os.getpid(), name) + path =3D os.path.join(test_dir, filename) + file_path_remover.paths.append(path) + paths.append(path) + + return paths[0] if len(paths) =3D=3D 1 else paths + + class VM(qtest.QEMUQtestMachine): '''A QEMU VM''' =20 --=20 2.11.1