On Wed, 20 Feb 2019 19:57:39 -0500 Cleber Rosa <cr...@redhat.com> wrote:
> Currently, the only test that contains some target architecture > information is "boot_linux_console.py" which test contains a "x86_64" But there are two others changed by you here, aren't there? > tag. But that tag is not respected in the default execution, that is, > "make check-acceptance" doesn't do anything with it. > > That said, even the target architecture handling currently present in > the "avocado_qemu.Test" class, class is pretty limited. For instance, s/class, class/class/ > by default, it chooses a target based on the host architecture. > > Because the original implementation of the tags feature in Avocado did > not include any time of namespace or "key:val" mechanism, no tag has > relation to another tag. The new implementation of the tags feature > from version 67.0 onwards, allows "key:val" tags, and because of that, > a test can be classified with a tag in a given key. For instance, the > new proposed version of the "boot_linux_console.py" test, which > downloads and attempts to run a x86_64 kernel, is now tagged as: > > :avocado: tags=arch:x86_64 > > This means that it can be filtered (out) when no x86_64 target is > available. At the same time, tests that don't have a "arch:" tag, > will not be filtered out. > > Signed-off-by: Cleber Rosa <cr...@redhat.com> > --- > tests/Makefile.include | 3 +++ > tests/acceptance/boot_linux_console.py | 2 +- > tests/acceptance/linux_initrd.py | 2 +- > tests/acceptance/virtio_version.py | 2 +- > tests/requirements.txt | 2 +- > 5 files changed, 7 insertions(+), 4 deletions(-) > > diff --git a/tests/Makefile.include b/tests/Makefile.include > index 93ea42553e..633992603d 100644 > --- a/tests/Makefile.include > +++ b/tests/Makefile.include > @@ -1090,6 +1090,7 @@ TESTS_RESULTS_DIR=$(BUILD_DIR)/tests/results > # Any number of command separated loggers are accepted. For more > # information please refer to "avocado --help". > AVOCADO_SHOW=app > +AVOCADO_TAGS=$(patsubst %-softmmu,-t arch:%, $(filter > %-softmmu,$(TARGET_DIRS))) > > ifneq ($(findstring v2,"v$(PYTHON_VERSION)"),v2) > $(TESTS_VENV_DIR): $(TESTS_VENV_REQ) > @@ -1115,6 +1116,8 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR) > $(call quiet-command, \ > $(TESTS_VENV_DIR)/bin/python -m avocado \ > --show=$(AVOCADO_SHOW) run > --job-results-dir=$(TESTS_RESULTS_DIR) \ > + --filter-by-tags-include-empty > --filter-by-tags-include-empty-key \ > + $(AVOCADO_TAGS) \ > --failfast=on $(SRC_PATH)/tests/acceptance, \ > "AVOCADO", "tests/acceptance") > > diff --git a/tests/acceptance/boot_linux_console.py > b/tests/acceptance/boot_linux_console.py > index 98324f7591..46b20bdfe2 100644 > --- a/tests/acceptance/boot_linux_console.py > +++ b/tests/acceptance/boot_linux_console.py > @@ -19,7 +19,7 @@ class BootLinuxConsole(Test): > and the kernel command line is properly passed from QEMU to the kernel > > :avocado: enable > - :avocado: tags=x86_64 > + :avocado: tags=arch:x86_64 > """ > > timeout = 60 > diff --git a/tests/acceptance/linux_initrd.py > b/tests/acceptance/linux_initrd.py > index 737355c2ef..c75e29be70 100644 > --- a/tests/acceptance/linux_initrd.py > +++ b/tests/acceptance/linux_initrd.py > @@ -19,7 +19,7 @@ class LinuxInitrd(Test): > Checks QEMU evaluates correctly the initrd file passed as -initrd option. > > :avocado: enable > - :avocado: tags=x86_64 > + :avocado: tags=arch:x86_64 > """ > > timeout = 60 > diff --git a/tests/acceptance/virtio_version.py > b/tests/acceptance/virtio_version.py > index ce990250d8..3b280e7fc3 100644 > --- a/tests/acceptance/virtio_version.py > +++ b/tests/acceptance/virtio_version.py > @@ -62,7 +62,7 @@ class VirtioVersionCheck(Test): > `disable-legacy`. > > :avocado: enable > - :avocado: tags=x86_64 > + :avocado: tags=arch:x86_64 > """ > > # just in case there are failures, show larger diff: > diff --git a/tests/requirements.txt b/tests/requirements.txt > index 64c6e27a94..002ded6a22 100644 > --- a/tests/requirements.txt > +++ b/tests/requirements.txt > @@ -1,4 +1,4 @@ > # Add Python module requirements, one per line, to be installed > # in the tests/venv Python virtual environment. For more info, > # refer to: https://pip.pypa.io/en/stable/user_guide/#id1 > -avocado-framework==65.0 > +avocado-framework==68.0 I think you should explain why you bump the required version to 68.0 instead of the 67.0 you mention above.
