Re: [PATCH 1/1] tests/acceptance: rename tests acceptance to tests avocado

[Willian Rampazzo]

On Thu, Nov 4, 2021 at 9:50 AM Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>
> On 11/3/21 22:14, Willian Rampazzo wrote:
> > In the discussion about renaming the `tests/acceptance` [1], the
> > conclusion was that the folders inside `tests` are related to the
> > framework running the tests and not directly related to the type of
> > the tests.
> >
> > This changes the folder to `tests/avocado` and adjusts the MAKEFILE, the
> > CI related files and the documentation.
> >
> > [1] https://lists.gnu.org/archive/html/qemu-devel/2021-05/msg06553.html
> >
> > Signed-off-by: Willian Rampazzo <willianr@redhat.com>
> > ---
> >  64 files changed, 113 insertions(+), 118 deletions(-)
>
> > --- a/tests/Makefile.include
> > +++ b/tests/Makefile.include
>
> > -.PHONY: check-venv check-acceptance
> > +.PHONY: check-venv check-avocado
>
> > -check-acceptance: check-venv $(TESTS_RESULTS_DIR) get-vm-images
> > +check-avocado: check-venv $(TESTS_RESULTS_DIR) get-vm-images
> >       $(call quiet-command, \
> >              $(TESTS_VENV_DIR)/bin/python -m avocado \
> >              --show=$(AVOCADO_SHOW) run 
> > --job-results-dir=$(TESTS_RESULTS_DIR) \
>
> We should keep check-acceptance, eventually printing a deprecation
> message. Smth like:
>
>   check-acceptance: check-avocado a
>       @echo "Note 'make $@' is deprecated, use 'make $<' instead" >&2
>

I agree.

> > --- a/tests/acceptance/ppc_prep_40p.py
> > +++ b/tests/avocado/ppc_prep_40p.py
> > @@ -13,6 +13,10 @@
> >
> >
> >  class IbmPrep40pMachine(Test):
> > +    """
> > +    :avocado: tags=arch:ppc
> > +    :avocado: tags=machine:40p
> > +    """
> >
> >      timeout = 60
> >
> > @@ -24,8 +28,6 @@ class IbmPrep40pMachine(Test):
> >      @skipUnless(os.getenv('AVOCADO_ALLOW_UNTRUSTED_CODE'), 'untrusted 
> > code')
> >      def test_factory_firmware_and_netbsd(self):
> >          """
> > -        :avocado: tags=arch:ppc
> > -        :avocado: tags=machine:40p
> >          :avocado: tags=os:netbsd
> >          :avocado: tags=slowness:high
> >          """
> > @@ -48,10 +50,6 @@ def test_factory_firmware_and_netbsd(self):
> >          wait_for_console_pattern(self, 'Model: IBM PPS Model 6015')
> >
> >      def test_openbios_192m(self):
> > -        """
> > -        :avocado: tags=arch:ppc
> > -        :avocado: tags=machine:40p
> > -        """
> >          self.vm.set_console()
> >          self.vm.add_args('-m', '192') # test fw_cfg
> >
> > @@ -62,8 +60,6 @@ def test_openbios_192m(self):
> >
> >      def test_openbios_and_netbsd(self):
> >          """
> > -        :avocado: tags=arch:ppc
> > -        :avocado: tags=machine:40p
> >          :avocado: tags=os:netbsd
> >          """
> >          drive_url = ('https://archive.netbsd.org/pub/NetBSD-archive/'
>
> Unrelated change, otherwise:

Ouch, looks like I took one of my test changes. I'll wait for some
more comments and remove this change on a v2.

>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>

Thanks!