| Message ID | 20210924185506.2542588-17-crosa@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Acceptance Tests: use Avocado 91.0 features and other improvements | expand |
On 9/24/21 20:55, Cleber Rosa wrote: > The arch and machine tags apply to all tests, so let's define them > only once. IIRC this was not the case at the beginning with Avocado 65.0 at least, right? If so, maybe mention since when it is possible? > Signed-off-by: Cleber Rosa <crosa@redhat.com> > --- > tests/acceptance/ppc_prep_40p.py | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/tests/acceptance/ppc_prep_40p.py b/tests/acceptance/ppc_prep_40p.py > index 5e61e686bd..d1e5674673 100644 > --- a/tests/acceptance/ppc_prep_40p.py > +++ b/tests/acceptance/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/' >
On Fri, Sep 24, 2021 at 4:01 PM Cleber Rosa <crosa@redhat.com> wrote: > > The arch and machine tags apply to all tests, so let's define them > only once. > > Signed-off-by: Cleber Rosa <crosa@redhat.com> > --- > tests/acceptance/ppc_prep_40p.py | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > Reviewed-by: Willian Rampazzo <willianr@redhat.com>
On Wed, Oct 6, 2021 at 4:17 PM Willian Rampazzo <wrampazz@redhat.com> wrote: > > On Fri, Sep 24, 2021 at 4:01 PM Cleber Rosa <crosa@redhat.com> wrote: > > > > The arch and machine tags apply to all tests, so let's define them > > only once. > > > > Signed-off-by: Cleber Rosa <crosa@redhat.com> > > --- > > tests/acceptance/ppc_prep_40p.py | 12 ++++-------- > > 1 file changed, 4 insertions(+), 8 deletions(-) > > > > Reviewed-by: Willian Rampazzo <willianr@redhat.com> Also: Tested-by: Willian Rampazzo <willianr@redhat.com>
diff --git a/tests/acceptance/ppc_prep_40p.py b/tests/acceptance/ppc_prep_40p.py index 5e61e686bd..d1e5674673 100644 --- a/tests/acceptance/ppc_prep_40p.py +++ b/tests/acceptance/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/'
The arch and machine tags apply to all tests, so let's define them only once. Signed-off-by: Cleber Rosa <crosa@redhat.com> --- tests/acceptance/ppc_prep_40p.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)