{"id":2215447,"url":"http://patchwork.ozlabs.org/api/patches/2215447/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260324163543.55503-4-thuth@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260324163543.55503-4-thuth@redhat.com>","list_archive_url":null,"date":"2026-03-24T16:35:40","name":"[3/4] tests/functional/qemu_test: Split huge fetch() function in asset.py","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"34a73ddf515688a0ff661aa857a6cd1fb8155326","submitter":{"id":66152,"url":"http://patchwork.ozlabs.org/api/people/66152/?format=json","name":"Thomas Huth","email":"thuth@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260324163543.55503-4-thuth@redhat.com/mbox/","series":[{"id":497313,"url":"http://patchwork.ozlabs.org/api/series/497313/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=497313","date":"2026-03-24T16:35:37","name":"Silence some pylint warnings in tests/functional/qemu_test/","version":1,"mbox":"http://patchwork.ozlabs.org/series/497313/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2215447/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2215447/checks/","tags":{},"related":[],"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=SnT29n8z;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fgG0J38B1z1y1G\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 25 Mar 2026 03:37:04 +1100 (AEDT)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1w54jz-00017e-Cq; Tue, 24 Mar 2026 12:36:27 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <thuth@redhat.com>) id 1w54jt-00016R-Hg\n for qemu-devel@nongnu.org; Tue, 24 Mar 2026 12:36:21 -0400","from us-smtp-delivery-124.mimecast.com ([170.10.133.124])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <thuth@redhat.com>) id 1w54jr-0004kc-UW\n for qemu-devel@nongnu.org; Tue, 24 Mar 2026 12:36:21 -0400","from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com\n (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by\n relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n cipher=TLS_AES_256_GCM_SHA384) id us-mta-26-eKFkCV7sOvCypvJZYvZIRw-1; Tue,\n 24 Mar 2026 12:36:16 -0400","from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com\n (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 7C0B319560AB; Tue, 24 Mar 2026 16:36:15 +0000 (UTC)","from thuth-p1g4.redhat.com (unknown [10.45.224.189])\n by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP\n id E8DF61800768; Tue, 24 Mar 2026 16:36:11 +0000 (UTC)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1774370178;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=XzV8UoDsgxkpKzeQqTX0p9JHx0Z7uhkmA5QCkKohu6c=;\n b=SnT29n8zDBJW1HVpFJ0R3sqyJSBdc+z9X1mpg1Q35+FVZIgqEiDVkn+kaXVNUK0cALblhx\n XAkPXrk2pRWK1aFc/L6hmU6tQr4HKfEVRxWATrIzcdSucJwdv/RkZm6eYT2hkYFIAlMqwt\n /s+CISLuoBrf+ByymQ2F36tKaMrzu9Y=","X-MC-Unique":"eKFkCV7sOvCypvJZYvZIRw-1","X-Mimecast-MFC-AGG-ID":"eKFkCV7sOvCypvJZYvZIRw_1774370175","From":"Thomas Huth <thuth@redhat.com>","To":"qemu-devel@nongnu.org","Cc":"=?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= <berrange@redhat.com>, =?utf-8?q?P?=\n\t=?utf-8?q?hilippe_Mathieu-Daud=C3=A9?= <philmd@linaro.org>,\n Thomas Huth <thuth@redhat.com>","Subject":"[PATCH 3/4] tests/functional/qemu_test: Split huge fetch() function\n in asset.py","Date":"Tue, 24 Mar 2026 17:35:40 +0100","Message-ID":"<20260324163543.55503-4-thuth@redhat.com>","In-Reply-To":"<20260324163543.55503-1-thuth@redhat.com>","References":"<20260324163543.55503-1-thuth@redhat.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-Scanned-By":"MIMEDefang 3.4.1 on 10.30.177.93","Received-SPF":"pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com;\n 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,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001,\n RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001,\n RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001,\n 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":"qemu development <qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<https://lists.nongnu.org/archive/html/qemu-devel>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"From: Thomas Huth <thuth@redhat.com>\n\nThe fetch() function has become really huge and pylint complains about\nthat. Extract the internal retry-three-times-download loop into a\nseparate function to make it a little bit more readable and to make\npylint happy about this file again.\n\nSigned-off-by: Thomas Huth <thuth@redhat.com>\n---\n tests/functional/qemu_test/asset.py | 43 ++++++++++++++++-------------\n 1 file changed, 24 insertions(+), 19 deletions(-)","diff":"diff --git a/tests/functional/qemu_test/asset.py b/tests/functional/qemu_test/asset.py\nindex 1cd03c2a9a9..51a434b2b70 100644\n--- a/tests/functional/qemu_test/asset.py\n+++ b/tests/functional/qemu_test/asset.py\n@@ -133,24 +133,7 @@ def _save_time_stamp(self):\n         '''\n         self.cache_file.with_suffix(\".stamp\").write_text(f\"{int(time.time())}\")\n \n-    def fetch(self):\n-        '''Download the asset from the internet'''\n-        if not self.cache_dir.exists():\n-            self.cache_dir.mkdir(parents=True, exist_ok=True)\n-\n-        if self.valid():\n-            self.log.debug(\"Using cached asset %s for %s\",\n-                           self.cache_file, self.url)\n-            self._save_time_stamp()\n-            return str(self.cache_file)\n-\n-        if not self.fetchable():\n-            raise AssetError(self,\n-                             \"Asset cache is invalid and downloads disabled\")\n-\n-        self.log.info(\"Downloading %s to %s...\", self.url, self.cache_file)\n-        tmp_cache_file = self.cache_file.with_suffix(\".download\")\n-\n+    def _try_to_fetch(self, tmp_cache_file):\n         for _retries in range(3):\n             try:\n                 with tmp_cache_file.open(\"xb\") as dst:\n@@ -176,7 +159,7 @@ def fetch(self):\n                                \"waiting for other thread to finish...\",\n                                tmp_cache_file)\n                 if self._wait_for_other_download(tmp_cache_file):\n-                    return str(self.cache_file)\n+                    return True\n                 self.log.debug(\"%s seems to be stale, \"\n                                \"deleting and retrying download...\",\n                                tmp_cache_file)\n@@ -213,6 +196,28 @@ def fetch(self):\n                 tmp_cache_file.unlink()\n                 raise AssetError(self, f\"Unable to download: {e}\",\n                                  transient=True) from e\n+        return False\n+\n+    def fetch(self):\n+        '''Download the asset from the internet'''\n+        if not self.cache_dir.exists():\n+            self.cache_dir.mkdir(parents=True, exist_ok=True)\n+\n+        if self.valid():\n+            self.log.debug(\"Using cached asset %s for %s\",\n+                           self.cache_file, self.url)\n+            self._save_time_stamp()\n+            return str(self.cache_file)\n+\n+        if not self.fetchable():\n+            raise AssetError(self,\n+                             \"Asset cache is invalid and downloads disabled\")\n+\n+        self.log.info(\"Downloading %s to %s...\", self.url, self.cache_file)\n+        tmp_cache_file = self.cache_file.with_suffix(\".download\")\n+\n+        if self._try_to_fetch(tmp_cache_file):\n+            return str(self.cache_file)\n \n         if not os.path.exists(tmp_cache_file):\n             raise AssetError(self, \"Download retries exceeded\", transient=True)\n","prefixes":["3/4"]}