From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 67A40606A33D for ; Fri, 20 Nov 2026 12:16:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=d4T3fxfu Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1xUNXR-000736-63; Fri, 20 Nov 2026 07:16:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xUNX6-0006Vd-6G for qemu-arm@nongnu.org; Fri, 20 Nov 2026 07:16:03 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1xUNX3-0006KG-Kf for qemu-arm@nongnu.org; Fri, 20 Nov 2026 07:15:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1795176956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=85hyB7iP46yS8tGIEW6CLSAIaB8NBOkTltCfh//dV6E=; b=d4T3fxfuy+hY3rdXSX5IybmmhCZMX7XeoFNgJk57Fo/qoE7Zj5dv5gw4UUE6Ni5oV62Rtg krzvR7BtNqV1gWY8LxzRxDYvIOwWsaBQYrl20wyOZPt0i/BTzzh4GozijPh4uL7wQEpQCs tr6Qjg1HoPAkmvzwgmDQRhI5VLadt8U= Received: from mx-prod-mc-03.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-375-1MdKs0dzMnW7eoMg9_WSxA-1; Fri, 20 Nov 2026 12:15:54 +0000 X-MC-Unique: 1MdKs0dzMnW7eoMg9_WSxA-1 X-Mimecast-MFC-AGG-ID: 1MdKs0dzMnW7eoMg9_WSxA_1795176952 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 71194195399F; Fri, 20 Nov 2026 12:15:52 +0000 (UTC) Received: from berrange.csb (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5ADA430000E8; Fri, 20 Nov 2026 12:15:48 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Pierrick Bouvier , Zhao Liu , Peter Maydell , Matthew Rosato , Halil Pasic , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Strahinja Jankovic , Niek Linnenbank , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , "Michael S. Tsirkin" , =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, Christian Borntraeger , qemu-ppc@nongnu.org, Thomas Huth , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Eric Farman Subject: [PATCH 10/12] tests/functional: always raise AssetError when download fails Date: Fri, 20 Nov 2026 12:14:56 +0000 Message-ID: <20261120121458.3723625-11-berrange@redhat.com> In-Reply-To: <20261120121458.3723625-1-berrange@redhat.com> References: <20261120121458.3723625-1-berrange@redhat.com> X-Archived-By: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-MFC-PROC-ID: ReaHexJKiLNTFdUvB6AUsCUq0VelRYCzrQP-ryCQQF0_1795176952 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 5 X-Spam_score: 0.5 X-Spam_bar: / X-Spam_report: (0.5 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS autolearn=ham autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 If two processes are downloading the same file, the second will wait for the first to finish. The second may encounter problems, however, and raise FileNotFoundError or TimeoutError. The layers up the stack, however, only expect/handle AssetError. Signed-off-by: Daniel P. Berrangé --- tests/functional/qemu_test/asset.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tests/functional/qemu_test/asset.py b/tests/functional/qemu_test/asset.py index 5a9a0f37e9a..313efcf7626 100644 --- a/tests/functional/qemu_test/asset.py +++ b/tests/functional/qemu_test/asset.py @@ -103,7 +103,9 @@ def _wait_for_other_download(self, tmp_cache_file): except: if os.path.exists(self.cache_file): return True - raise + raise AssetError( + self, f"Other thread failed download to {tmp_cache_file}", + transient=True) waittime = lastchange = 600 while waittime > 0: sleep(1) @@ -113,7 +115,9 @@ def _wait_for_other_download(self, tmp_cache_file): except: if os.path.exists(self.cache_file): return True - raise + raise AssetError( + self, f"Other thread failed download to {tmp_cache_file}", + transient=True) if new_size != current_size: lastchange = waittime current_size = new_size @@ -121,7 +125,8 @@ def _wait_for_other_download(self, tmp_cache_file): return False self.log.debug("Time out while waiting for %s!", tmp_cache_file) - raise TimeoutError(f"Time out while waiting for {tmp_cache_file}") + raise AssetError(f"Time out while waiting for {tmp_cache_file}", + transient=True) def _save_time_stamp(self): ''' -- 2.56.1