Skip to content

Revert recent Avocado changes

Paolo Bonzini qemu-devel 2 versions In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest2 patches 2 repliesIn review
  2. v12 patches 4 repliesSuperseded

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/2Revert "tests/requirements.txt: bump up avocado-framework version to 101.0"tests/Makefile.include tests/requirements.txt+8 -120 replies
2/2tests: Use separate virtual environment for avocado.gitlab-ci.d/buildtest.yml docs/devel/acpi-bits.rst docs/devel/testing.rst +5 more+28 -291 reply

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH v2 0/2] Revert recent Avocado changes

Bumping avocado to version 101 has two issues. First, there are problems where Avocado is not logging of command lines or terminal output, and not collecting Python logs outside the avocado namespace.

Second, the recent changes to Python handling mean that there is a single virtual environment for all the build, instead of a separate one for testing. Requiring a too-new version of avocado causes conflicts with any avocado plugins installed on the host:

   $ make check-venv
   make[1]: Entering directory '/home/berrange/src/virt/qemu/build'
     GIT     ui/keycodemapdb tests/fp/berkeley-testfloat-3 tests/fp/berkeley-softfloat-3 dtc
     VENVPIP install -e /home/berrange/src/virt/qemu/python/
     VENVPIP install -r /home/berrange/src/virt/qemu/tests/requirements.txt
   ERROR: pip's dependency resolver does not currently take into account all the packages that are installed. This behaviour is the source of the following dependency conflicts.
   avocado-framework-plugin-varianter-yaml-to-mux 98.0 requires avocado-framework==98.0, but you have avocado-framework 101.0 which is incompatible.
   avocado-framework-plugin-result-html 98.0 requires avocado-framework==98.0, but you have avocado-framework 101.0 which is incompatible.
   make[1]: Leaving directory '/home/berrange/src/virt/qemu/build'

To avoid this issue, tests/requirements.txt should use a ">=" constraint and the version of Avocado should be limited to what distros provide in the system packages. However, this requires more work, so for now reintroduce the avocado-specific virtual environment instead of using pyvenv/.

Paolo

Supersedes: <[email protected]>

Paolo Bonzini (2):
Revert "tests/requirements.txt: bump up avocado-framework version to

    101.0"

tests: Use separate virtual environment for avocado

 .gitlab-ci.d/buildtest.yml                    |  6 ++--
 docs/devel/acpi-bits.rst                      |  6 ++--
 docs/devel/testing.rst                        | 14 ++++----
 .../org.centos/stream/8/x86_64/test-avocado   |  4 +--
 scripts/device-crash-test                     |  2 +-
 tests/Makefile.include                        | 32 +++++++++----------
 tests/requirements.txt                        |  9 ++----
 tests/vm/Makefile.include                     |  2 +-
 8 files changed, 35 insertions(+), 40 deletions(-)
Signature · 1 line
2.40.1