diff options
| author | Daniel P. Berrangé <berrange@redhat.com> | 2025-08-29 15:26:16 +0100 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2025-09-09 09:57:51 +0200 |
| commit | 335da23abec85cd2f6d10f1fe36b28a02088e723 (patch) | |
| tree | 0e24671d63397a1009116d6dca721b62b2d16aa8 /tests/functional/qemu_test | |
| parent | 124ab930ba38c41a86533dbfabb7a3b3b270ef98 (diff) | |
| download | focaccia-qemu-335da23abec85cd2f6d10f1fe36b28a02088e723.tar.gz focaccia-qemu-335da23abec85cd2f6d10f1fe36b28a02088e723.zip | |
tests/functional: handle URLError when fetching assets
We treat most HTTP errors as non-fatal when fetching assets, but forgot to handle network level errors. This adds catching of URLError so that we retry on failure, and will ultimately trigger graceful skipping in the pre-cache task. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Thomas Huth <thuth@redhat.com> Message-ID: <20250829142616.2633254-4-berrange@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'tests/functional/qemu_test')
| -rw-r--r-- | tests/functional/qemu_test/asset.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tests/functional/qemu_test/asset.py b/tests/functional/qemu_test/asset.py index 5c74adf224..2dd32bf28d 100644 --- a/tests/functional/qemu_test/asset.py +++ b/tests/functional/qemu_test/asset.py @@ -15,7 +15,7 @@ import urllib.request from time import sleep from pathlib import Path from shutil import copyfileobj -from urllib.error import HTTPError +from urllib.error import HTTPError, URLError class AssetError(Exception): def __init__(self, asset, msg, transient=False): @@ -171,6 +171,14 @@ class Asset: raise AssetError(self, "Unable to download: " "HTTP error %d" % e.code) continue + except URLError as e: + # This is typically a network/service level error + # eg urlopen error [Errno 110] Connection timed out> + tmp_cache_file.unlink() + 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=True) except Exception as e: tmp_cache_file.unlink() raise AssetError(self, "Unable to download: %s" % e) |