From nobody Fri Nov 14 21:01:23 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1760522154; cv=none; d=zohomail.com; s=zohoarc; b=YS5d/GXcXi0w+8QLgSxkFLgabB9X0sFXfNwA2j3BZoziHjY4+dlj2OXme06xC2zTOSSknRG29gzbAyP1lCOIEwf5Chdr81+sspL3gGVQsfGVKs+XrbGd8iUR2WAPGDLYmEsFLmdFJIkuM0x2x/aR8xefuR1uR8sFNKbOowi/T0s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760522154; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=eej4eXehqD6s7xgoinmY1rL3UtSYqlfMI37LVRtGDn4=; b=bOPKkghK6iIVmKRtksuaVgkkxvXK8JZip5eZA95o/wwQyUv5OYCTRFqp2+vHa6wChGa12hDpbq+9lDm/ygc2+TplqZWXOZNO4zTIRBNYFXc8iqah/82w/8O5gkA6GFnDWE7ln51y83B3Scgq/+go++UGhzJOT0iCkACFuIGRzk8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760522154388570.2924198627074; Wed, 15 Oct 2025 02:55:54 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v8yDv-0003Li-OQ; Wed, 15 Oct 2025 05:55:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v8yDt-0003LS-C2 for qemu-devel@nongnu.org; Wed, 15 Oct 2025 05:55:09 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v8yDq-0004RL-4E for qemu-devel@nongnu.org; Wed, 15 Oct 2025 05:55:09 -0400 Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-128-BoyrKg7vNRKUz8L0AsZb3w-1; Wed, 15 Oct 2025 05:55:00 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6F0F01956094; Wed, 15 Oct 2025 09:54:59 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.45.224.24]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1E290180044F; Wed, 15 Oct 2025 09:54:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1760522102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eej4eXehqD6s7xgoinmY1rL3UtSYqlfMI37LVRtGDn4=; b=Ql2cOt9dOYDMiHJF8VIUfJrZYb9kHvIp8HTXRVGKKG4GDq5ReiYU2P9R7u2tnO2Zda0oGb 9X1WD9PwshJmtZ0fcFR2it/5HC4ua3bSX4o65kCChjpHyUHFh4VRKclZ4cvaD3dq7GC3AT AJ1Y3u1Thn8JdqFJQPMp8GfN7B1N+uI= X-MC-Unique: BoyrKg7vNRKUz8L0AsZb3w-1 X-Mimecast-MFC-AGG-ID: BoyrKg7vNRKUz8L0AsZb3w_1760522099 From: Thomas Huth To: qemu-devel@nongnu.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/6] tests/functional: Fix problems in asset.py reported by pylint Date: Wed, 15 Oct 2025 11:54:49 +0200 Message-ID: <20251015095454.1575318-2-thuth@redhat.com> In-Reply-To: <20251015095454.1575318-1-thuth@redhat.com> References: <20251015095454.1575318-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1760522156917154100 Content-Type: text/plain; charset="utf-8" From: Thomas Huth The "raise" without an Exception was a real problem, the other spots are rather cosmetics. Signed-off-by: Thomas Huth --- tests/functional/qemu_test/asset.py | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/tests/functional/qemu_test/asset.py b/tests/functional/qemu_te= st/asset.py index f666125bfaf..ba3771027b4 100644 --- a/tests/functional/qemu_test/asset.py +++ b/tests/functional/qemu_test/asset.py @@ -111,7 +111,7 @@ def _wait_for_other_download(self, tmp_cache_file): return False =20 self.log.debug("Time out while waiting for %s!", tmp_cache_file) - raise + raise TimeoutError(f"Time out while waiting for {tmp_cache_file}") =20 def fetch(self): if not self.cache_dir.exists(): @@ -129,7 +129,7 @@ def fetch(self): self.log.info("Downloading %s to %s...", self.url, self.cache_file) tmp_cache_file =3D self.cache_file.with_suffix(".download") =20 - for retries in range(3): + for _ in range(3): try: with tmp_cache_file.open("xb") as dst: with urllib.request.urlopen(self.url) as resp: @@ -169,7 +169,7 @@ def fetch(self): # server or networking problem if e.code =3D=3D 404: raise AssetError(self, "Unable to download: " - "HTTP error %d" % e.code) + "HTTP error %d" % e.code) from e continue except URLError as e: # This is typically a network/service level error @@ -178,7 +178,7 @@ def fetch(self): self.log.error("Unable to download %s: URL error %s", self.url, e.reason) raise AssetError(self, "Unable to download: URL error %s" % - e.reason, transient=3DTrue) + e.reason, transient=3DTrue) from e except ConnectionError as e: # A socket connection failure, such as dropped conn # or refused conn @@ -189,7 +189,7 @@ def fetch(self): except Exception as e: tmp_cache_file.unlink() raise AssetError(self, "Unable to download: %s" % e, - transient=3DTrue) + transient=3DTrue) from e =20 if not os.path.exists(tmp_cache_file): raise AssetError(self, "Download retries exceeded", transient= =3DTrue) @@ -202,7 +202,6 @@ def fetch(self): self.hash.encode('utf8')) except Exception as e: self.log.debug("Unable to set xattr on %s: %s", tmp_cache_file= , e) - pass =20 if not self._check(tmp_cache_file): tmp_cache_file.unlink() @@ -211,9 +210,10 @@ def fetch(self): # Remove write perms to stop tests accidentally modifying them os.chmod(self.cache_file, stat.S_IRUSR | stat.S_IRGRP) =20 - self.log.info("Cached %s at %s" % (self.url, self.cache_file)) + self.log.info("Cached %s at %s", self.url, self.cache_file) return str(self.cache_file) =20 + @staticmethod def precache_test(test): log =3D logging.getLogger('qemu-test') log.setLevel(logging.DEBUG) @@ -224,16 +224,17 @@ def precache_test(test): handler.setFormatter(formatter) log.addHandler(handler) for name, asset in vars(test.__class__).items(): - if name.startswith("ASSET_") and type(asset) =3D=3D Asset: + if name.startswith("ASSET_") and isinstance(asset, Asset): try: asset.fetch() except AssetError as e: if not e.transient: raise - log.error("%s: skipping asset precache" % e) + log.error("%s: skipping asset precache", e) =20 log.removeHandler(handler) =20 + @staticmethod def precache_suite(suite): for test in suite: if isinstance(test, unittest.TestSuite): @@ -241,9 +242,10 @@ def precache_suite(suite): elif isinstance(test, unittest.TestCase): Asset.precache_test(test) =20 - def precache_suites(path, cacheTstamp): + @staticmethod + def precache_suites(path, cache_tstamp): loader =3D unittest.loader.defaultTestLoader tests =3D loader.loadTestsFromNames([path], None) =20 - with open(cacheTstamp, "w") as fh: + with open(cache_tstamp, "w", encoding=3D'utf-8'): Asset.precache_suite(tests) --=20 2.51.0