[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 05/11] tests/functional: Implement fetch_asset() method for d
From: |
Daniel P . Berrangé |
Subject: |
Re: [PATCH 05/11] tests/functional: Implement fetch_asset() method for downloading assets |
Date: |
Tue, 16 Jul 2024 19:17:54 +0100 |
User-agent: |
Mutt/2.2.12 (2023-09-09) |
On Tue, Jul 16, 2024 at 01:26:08PM +0200, Thomas Huth wrote:
> In the new python test framework, we cannot use the fetch_asset()
> function from Avocado anymore, so we have to provide our own
> implementation now instead. Thus add such a function based on the
> urllib python module for this purpose.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> tests/functional/qemu_test/__init__.py | 36 ++++++++++++++++++++++++++
> 1 file changed, 36 insertions(+)
>
> diff --git a/tests/functional/qemu_test/__init__.py
> b/tests/functional/qemu_test/__init__.py
> index e73705d40a..77c3b14d34 100644
> --- a/tests/functional/qemu_test/__init__.py
> +++ b/tests/functional/qemu_test/__init__.py
> @@ -11,6 +11,8 @@
> # This work is licensed under the terms of the GNU GPL, version 2 or
> # later. See the COPYING file in the top-level directory.
>
> +import hashlib
> +import urllib.request
> import logging
> import os
> import pycotap
> @@ -23,6 +25,7 @@
> import unittest
>
> from pathlib import Path
> +from shutil import copyfileobj
> from qemu.machine import QEMUMachine
> from qemu.utils import (get_info_usernet_hostfwd_port, kvm_available,
> tcg_available)
> @@ -215,6 +218,39 @@ def setUp(self, bin_prefix):
> if not os.path.exists(self.workdir):
> os.makedirs(self.workdir)
>
> + def check_hash(self, file_name, expected_hash):
> + if not expected_hash:
> + return True
> + if len(expected_hash) == 40:
> + sum_prog = 'sha1sum'
> + elif len(expected_hash) == 64:
> + sum_prog = 'sha256sum'
> + elif len(expected_hash) == 128:
> + sum_prog = 'sha512sum'
> + else:
> + raise Exception("unknown hash type")
> + checksum = subprocess.check_output([sum_prog, file_name]).split()[0]
> + return expected_hash == checksum.decode("utf-8")
> +
> + def fetch_asset(self, url, asset_hash):
> + cache_dir = os.path.expanduser("~/.cache/qemu/download")
> + if not os.path.exists(cache_dir):
> + os.makedirs(cache_dir)
> + fname = os.path.join(cache_dir,
> + hashlib.sha256(url.encode("utf-8")).hexdigest())
> + if os.path.exists(fname) and self.check_hash(fname, asset_hash):
> + return fname
> + self.log.info("Downloading %s to %s...", url, fname)
> + dl_fname = fname + ".download"
> + with urllib.request.urlopen(url) as src:
> + with open(dl_fname, "wb+") as dst:
> + copyfileobj(src, dst)
For cleanliness we should probably wrap this and delete the file on
error, eg
try:
with open(dl_fname,....) as dst
....
except:
os.remove(dl_fname)
raise
> + if not self.check_hash(dl_fname, asset_hash):
> + os.remove(dl_fname)
> + raise Exception("Hash of " + url + " does not match")
> + os.rename(dl_fname, fname)
> + return fname
> +
> def main():
> tr = pycotap.TAPTestRunner(message_log = pycotap.LogMode.LogToError,
> test_output_log =
> pycotap.LogMode.LogToError)
> --
> 2.45.2
>
With regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
- [PATCH 02/11] tests/functional: Convert simple avocado tests into standalone python tests, (continued)
- [PATCH 02/11] tests/functional: Convert simple avocado tests into standalone python tests, Thomas Huth, 2024/07/16
- [PATCH 01/11] tests/functional: Add base classes for the upcoming pytest-based tests, Thomas Huth, 2024/07/16
- [PATCH 04/11] tests/functional: Add python-based tests to the meson build system, Thomas Huth, 2024/07/16
- [PATCH 03/11] tests/functional: Convert avocado tests that just need a small adjustment, Thomas Huth, 2024/07/16
- [PATCH 05/11] tests/functional: Implement fetch_asset() method for downloading assets, Thomas Huth, 2024/07/16
- Re: [PATCH 05/11] tests/functional: Implement fetch_asset() method for downloading assets,
Daniel P . Berrangé <=
- [PATCH 08/11] tests/functional: Convert some avocado tests that needed avocado.utils.archive, Thomas Huth, 2024/07/16
- [PATCH 06/11] tests/functional: Convert some tests that download files via fetch_asset(), Thomas Huth, 2024/07/16
- [PATCH 09/11] tests/functional: Set up logging, Thomas Huth, 2024/07/16
- [PATCH 10/11] tests/functional: Convert the s390x avocado tests into standalone tests, Thomas Huth, 2024/07/16
- [PATCH 07/11] tests/functional: Add a function for extracting files from an archive, Thomas Huth, 2024/07/16