From: "Daniel P. Berrangé" <berrange@redhat.com>
To: "Philippe Mathieu-Daudé" <philmd@linaro.org>
Cc: "Thomas Huth" <thuth@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
qemu-devel@nongnu.org, "Ani Sinha" <anisinha@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"John Snow" <jsnow@redhat.com>,
qemu-ppc@nongnu.org, "Fabiano Rosas" <farosas@suse.de>
Subject: Re: [PATCH v4 14/35] tests/functional: add a module for handling asset download & caching
Date: Thu, 29 Aug 2024 10:57:59 +0100 [thread overview]
Message-ID: <ZtBGJzmkmflSze-V@redhat.com> (raw)
In-Reply-To: <ab83a55f-6413-4d8e-9fdc-edb5f568d6f4@linaro.org>
On Wed, Aug 21, 2024 at 04:49:42PM +0200, Philippe Mathieu-Daudé wrote:
> On 21/8/24 10:27, Thomas Huth wrote:
> > From: Daniel P. Berrangé <berrange@redhat.com>
> >
> > The 'Asset' class is a simple module that declares a downloadable
> > asset that can be cached locally. Downloads are stored in the user's
> > home dir at ~/.cache/qemu/download, using a sha256 sum of the URL.
> >
> > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> > Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> > Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> > [thuth: Drop sha1 support, use hash on file content for naming instead of URL,
> > add the possibility to specify the cache dir via environment variable]
> > Signed-off-by: Thomas Huth <thuth@redhat.com>
> > ---
> > tests/functional/qemu_test/__init__.py | 1 +
> > tests/functional/qemu_test/asset.py | 97 ++++++++++++++++++++++++++
> > 2 files changed, 98 insertions(+)
> > create mode 100644 tests/functional/qemu_test/asset.py
> >
> > diff --git a/tests/functional/qemu_test/__init__.py b/tests/functional/qemu_test/__init__.py
> > index 2f1e0bc70d..db05c8f412 100644
> > --- a/tests/functional/qemu_test/__init__.py
> > +++ b/tests/functional/qemu_test/__init__.py
> > @@ -6,6 +6,7 @@
> > # later. See the COPYING file in the top-level directory.
> > +from .asset import Asset
> > from .config import BUILD_DIR
> > from .cmd import has_cmd, has_cmds, run_cmd, is_readable_executable_file, \
> > interrupt_interactive_console_until_pattern, wait_for_console_pattern, \
> > diff --git a/tests/functional/qemu_test/asset.py b/tests/functional/qemu_test/asset.py
> > new file mode 100644
> > index 0000000000..cbeb6278af
> > --- /dev/null
> > +++ b/tests/functional/qemu_test/asset.py
> > @@ -0,0 +1,97 @@
> > +# Test utilities for fetching & caching assets
> > +#
> > +# Copyright 2024 Red Hat, Inc.
> > +#
> > +# 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 logging
> > +import os
> > +import subprocess
> > +import urllib.request
> > +from pathlib import Path
> > +from shutil import copyfileobj
> > +
> > +
> > +# Instances of this class must be declared as class level variables
> > +# starting with a name "ASSET_". This enables the pre-caching logic
> > +# to easily find all referenced assets and download them prior to
> > +# execution of the tests.
> > +class Asset:
> > +
> > + def __init__(self, url, hashsum):
> > + self.url = url
> > + self.hash = hashsum
> > + cache_dir_env = os.getenv('QEMU_TEST_CACHE_DIR')
> > + if cache_dir_env:
> > + self.cache_dir = Path(cache_dir_env, "download")
> > + else:
> > + self.cache_dir = Path(Path("~").expanduser(),
> > + ".cache", "qemu", "download")
> > + self.cache_file = Path(self.cache_dir, hashsum)
> > + self.log = logging.getLogger('qemu-test')
> > +
> > + def __repr__(self):
> > + return "Asset: url=%s hash=%s cache=%s" % (
> > + self.url, self.hash, self.cache_file)
> > +
> > + def _check(self, cache_file):
> > + if self.hash is None:
> > + return True
> > + if len(self.hash) == 64:
> > + sum_prog = 'sha256sum'
> > + elif len(self.hash) == 128:
> > + sum_prog = 'sha512sum'
> > + else:
> > + raise Exception("unknown hash type")
> > +
> > + checksum = subprocess.check_output(
> > + [sum_prog, str(cache_file)]).split()[0]
> > + return self.hash == checksum.decode("utf-8")
> > +
> > + def valid(self):
> > + return self.cache_file.exists() and self._check(self.cache_file)
> > +
> > + def fetch(self):
> > + if not self.cache_dir.exists():
> > + self.cache_dir.mkdir(parents=True, exist_ok=True)
>
> This doesn't work with QEMU_TEST_CACHE_DIR set to someone else:
>
> File
> "/home/philippe.mathieu-daude/qemu/tests/functional/qemu_test/asset.py",
> line 60, in fetch
> self.cache_dir.mkdir(parents=True, exist_ok=True)
> File "/usr/lib/python3.10/pathlib.py", line 1175, in mkdir
> self._accessor.mkdir(self, mode)
> PermissionError: [Errno 13] Permission denied:
> '/home/alex.bennee/.cache/qemu/download'
> ninja: build stopped: subcommand failed.
>
> Maybe use a getter which falls back to Path("~").expanduser() when
> no access on QEMU_TEST_CACHE_DIR? This happens when downloading a
> new file (the recent MIPS tests I converted) which isn't in Alex's cache:
Is it really valid to point QEMU_TEST_CACHE_DIR to a directory
that you don't have permission to access ? This feels like it
could be classed as invalid usage to me, rather than needing a
workaround.
>
> 2024-08-21 15:45:48,896 - qemu-test - INFO - Attempting to cache 'Asset: url=https://s3-eu-west-1.amazonaws.com/downloads-mips/mips-downloads/YAMON/yamon-bin-02.22.zip
> hash=eef86f0eed0ef554f041dcd47b87eebea0e6f9f1184ed31f7e9e8b4a803860ab cache=/home/alex.bennee/.cache/download/eef86f0eed0ef554f041dcd47b87eebea0e6f9f1184ed31f7e9e8b4a803860ab'
>
> > + if self.valid():
> > + self.log.debug("Using cached asset %s for %s",
> > + self.cache_file, self.url)
> > + return str(self.cache_file)
> > +
> > + self.log.info("Downloading %s to %s...", self.url, self.cache_file)
> > + tmp_cache_file = self.cache_file.with_suffix(".download")
> > +
> > + try:
> > + resp = urllib.request.urlopen(self.url)
> > + except Exception as e:
> > + self.log.error("Unable to download %s: %s", self.url, e)
> > + raise
> > +
> > + try:
> > + with tmp_cache_file.open("wb+") as dst:
> > + copyfileobj(resp, dst)
> > + except:
> > + tmp_cache_file.unlink()
> > + raise
> > + try:
> > + # Set these just for informational purposes
> > + os.setxattr(str(tmp_cache_file), "user.qemu-asset-url",
> > + self.url.encode('utf8'))
> > + os.setxattr(str(tmp_cache_file), "user.qemu-asset-hash",
> > + self.hash.encode('utf8'))
> > + except Exception as e:
> > + self.log.info("Unable to set xattr on %s: %s", tmp_cache_file, e)
> > + pass
> > +
> > + if not self._check(tmp_cache_file):
> > + tmp_cache_file.unlink()
> > + raise Exception("Hash of %s does not match %s" %
> > + (self.url, self.hash))
> > + tmp_cache_file.replace(self.cache_file)
> > +
> > + self.log.info("Cached %s at %s" % (self.url, self.cache_file))
> > + return str(self.cache_file)
>
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 :|
next prev parent reply other threads:[~2024-08-29 9:58 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-21 8:27 [PATCH v4 00/35] Convert avocado tests to normal Python unittests Thomas Huth
2024-08-21 8:27 ` [PATCH v4 01/35] tests/avocado: machine aarch64: standardize location and RO access Thomas Huth
2024-08-21 9:30 ` Philippe Mathieu-Daudé
2024-08-21 8:27 ` [PATCH v4 02/35] tests/avocado/boot_xen.py: fetch kernel during test setUp() Thomas Huth
2024-08-21 8:27 ` [PATCH v4 03/35] tests/avocado/machine_aarch64_sbsaref.py: allow for rw usage of image Thomas Huth
2024-08-21 8:27 ` [PATCH v4 04/35] Bump avocado to 103.0 Thomas Huth
2024-08-21 10:34 ` Philippe Mathieu-Daudé
2024-08-29 9:45 ` Daniel P. Berrangé
2024-08-21 8:27 ` [PATCH v4 05/35] tests/avocado/avocado_qemu: Fix the "from" statements in linuxtest.py Thomas Huth
2024-08-21 9:31 ` Philippe Mathieu-Daudé
2024-08-21 10:07 ` Thomas Huth
2024-08-21 10:18 ` Philippe Mathieu-Daudé
2024-08-21 8:27 ` [PATCH v4 06/35] tests/avocado/boot_linux_console: Remove the s390x subtest Thomas Huth
2024-08-29 9:46 ` Daniel P. Berrangé
2024-08-21 8:27 ` [PATCH v4 07/35] python: Install pycotap in our venv if necessary Thomas Huth
2024-08-29 9:49 ` Daniel P. Berrangé
2024-08-21 8:27 ` [PATCH v4 08/35] tests/functional: Add base classes for the upcoming pytest-based tests Thomas Huth
2024-08-21 8:27 ` [PATCH v4 09/35] tests/functional: Set up logging Thomas Huth
2024-08-21 8:27 ` [PATCH v4 10/35] tests/Makefile.include: Increase the level of indentation in the help text Thomas Huth
2024-08-21 8:27 ` [PATCH v4 11/35] tests/functional: Prepare the meson build system for the functional tests Thomas Huth
2024-08-21 14:30 ` Philippe Mathieu-Daudé
2024-08-23 12:54 ` Philippe Mathieu-Daudé
2024-08-26 8:18 ` Thomas Huth
2024-08-29 9:54 ` Daniel P. Berrangé
2024-08-21 8:27 ` [PATCH v4 12/35] tests/functional: Convert simple avocado tests into standalone python tests Thomas Huth
2024-08-21 8:27 ` [PATCH v4 13/35] tests/functional: Convert avocado tests that just need a small adjustment Thomas Huth
2024-08-21 8:27 ` [PATCH v4 14/35] tests/functional: add a module for handling asset download & caching Thomas Huth
2024-08-21 14:49 ` Philippe Mathieu-Daudé
2024-08-29 9:57 ` Daniel P. Berrangé [this message]
2024-08-23 6:24 ` Philippe Mathieu-Daudé
2024-08-29 10:00 ` Daniel P. Berrangé
2024-08-21 8:27 ` [PATCH v4 15/35] tests/functional: enable pre-emptive caching of assets Thomas Huth
2024-08-23 7:28 ` Philippe Mathieu-Daudé
2024-08-27 13:16 ` Thomas Huth
2024-08-27 14:24 ` Thomas Huth
2024-08-29 10:15 ` Daniel P. Berrangé
2024-08-30 7:38 ` Thomas Huth
2024-08-30 7:42 ` Daniel P. Berrangé
2024-08-30 11:27 ` Thomas Huth
2024-08-30 11:37 ` Daniel P. Berrangé
2024-08-21 8:27 ` [PATCH v4 16/35] tests/functional: Convert some tests that download files via fetch_asset() Thomas Huth
2024-08-21 8:27 ` [PATCH v4 17/35] tests/functional: Add a function for extracting files from an archive Thomas Huth
2024-08-21 8:27 ` [PATCH v4 18/35] tests/functional: Convert some avocado tests that needed avocado.utils.archive Thomas Huth
2024-08-21 8:27 ` [PATCH v4 19/35] tests/functional: Convert the s390x avocado tests into standalone tests Thomas Huth
2024-08-21 8:27 ` [PATCH v4 20/35] tests/functional: Convert the x86_cpu_model_versions test Thomas Huth
2024-08-21 8:27 ` [PATCH v4 21/35] tests/functional: Convert the microblaze avocado tests into standalone tests Thomas Huth
2024-08-21 8:27 ` [PATCH v4 22/35] tests/functional: Convert the riscv_opensbi avocado test into a standalone test Thomas Huth
2024-08-21 8:27 ` [PATCH v4 23/35] tests/functional: Convert the virtio_gpu " Thomas Huth
2024-08-21 8:27 ` [PATCH v4 24/35] tests/functional: Convert most ppc avocado tests into standalone tests Thomas Huth
2024-08-21 8:27 ` [PATCH v4 25/35] tests/functional: Convert the ppc_amiga avocado test into a standalone test Thomas Huth
2024-08-21 8:27 ` [PATCH v4 26/35] tests/functional: Convert the ppc_hv " Thomas Huth
2024-08-21 9:43 ` Philippe Mathieu-Daudé
2024-08-21 10:11 ` Thomas Huth
2024-08-21 11:47 ` Philippe Mathieu-Daudé
2024-08-21 8:27 ` [PATCH v4 27/35] tests/functional: Convert the m68k nextcube test with tesseract Thomas Huth
2024-08-21 8:27 ` [PATCH v4 28/35] tests/functional: Convert the acpi-bits test into a standalone test Thomas Huth
2024-08-21 8:27 ` [PATCH v4 29/35] tests/functional: Convert the rx_gdbsim avocado " Thomas Huth
2024-08-21 8:27 ` [PATCH v4 30/35] tests/functional: Convert the linux_initrd " Thomas Huth
2024-08-21 8:27 ` [PATCH v4 31/35] gitlab-ci: Add "check-functional" to the build tests Thomas Huth
2024-08-21 8:27 ` [PATCH v4 32/35] docs/devel: Split testing docs from the build docs and move to separate folder Thomas Huth
2024-08-21 8:27 ` [PATCH v4 33/35] docs/devel/testing: Split the Avocado documentation into a separate file Thomas Huth
2024-08-29 10:18 ` Daniel P. Berrangé
2024-08-21 8:27 ` [PATCH v4 34/35] docs/devel/testing: Rename avocado_qemu.Test class Thomas Huth
2024-08-29 10:27 ` Daniel P. Berrangé
2024-08-21 8:27 ` [PATCH v4 35/35] docs/devel/testing: Add documentation for functional tests Thomas Huth
2024-08-29 10:34 ` Daniel P. Berrangé
2024-08-29 11:35 ` Thomas Huth
2024-08-29 11:43 ` Daniel P. Berrangé
2024-08-29 10:35 ` Daniel P. Berrangé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZtBGJzmkmflSze-V@redhat.com \
--to=berrange@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=anisinha@redhat.com \
--cc=farosas@suse.de \
--cc=jsnow@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.