[PATCH] tests/acceptance: move @skipUnless decoration to test itself

[PATCH] tests/acceptance: move @skipUnless decoration to test itself

[Alex Bennée]

It appears ignore the decoration if just applied to the class.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 tests/acceptance/machine_mips_malta.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/acceptance/machine_mips_malta.py b/tests/acceptance/machine_mips_malta.py
index 92b4f28a112..b8fac2a44d5 100644
--- a/tests/acceptance/machine_mips_malta.py
+++ b/tests/acceptance/machine_mips_malta.py
@@ -30,14 +30,14 @@ except ImportError:
     CV2_AVAILABLE = False
 
 
-@skipUnless(NUMPY_AVAILABLE, 'Python NumPy not installed')
-@skipUnless(CV2_AVAILABLE, 'Python OpenCV not installed')
 class MaltaMachineFramebuffer(Test):
 
     timeout = 30
 
     KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
 
+    @skipUnless(NUMPY_AVAILABLE, 'Python NumPy not installed')
+    @skipUnless(CV2_AVAILABLE, 'Python OpenCV not installed')
     def do_test_i6400_framebuffer_logo(self, cpu_cores_count):
         """
         Boot Linux kernel and check Tux logo is displayed on the framebuffer.
-- 
2.20.1

Re: [PATCH] tests/acceptance: move @skipUnless decoration to test itself

[Philippe Mathieu-Daudé]

On 3/2/20 7:09 PM, Alex Bennée wrote:
> It appears ignore the decoration if just applied to the class.

Odd I remember testing this, this might be a feature supported by a 
newer Avocado version than the one available on Travis-CI.

> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>   tests/acceptance/machine_mips_malta.py | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/acceptance/machine_mips_malta.py b/tests/acceptance/machine_mips_malta.py
> index 92b4f28a112..b8fac2a44d5 100644
> --- a/tests/acceptance/machine_mips_malta.py
> +++ b/tests/acceptance/machine_mips_malta.py
> @@ -30,14 +30,14 @@ except ImportError:
>       CV2_AVAILABLE = False
>   
>   
> -@skipUnless(NUMPY_AVAILABLE, 'Python NumPy not installed')
> -@skipUnless(CV2_AVAILABLE, 'Python OpenCV not installed')
>   class MaltaMachineFramebuffer(Test):
>   
>       timeout = 30
>   
>       KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
>   
> +    @skipUnless(NUMPY_AVAILABLE, 'Python NumPy not installed')
> +    @skipUnless(CV2_AVAILABLE, 'Python OpenCV not installed')
>       def do_test_i6400_framebuffer_logo(self, cpu_cores_count):
>           """
>           Boot Linux kernel and check Tux logo is displayed on the framebuffer.
> 

Unfortunately you have to also add it to the 7/8cores tests.

Re: [PATCH] tests/acceptance: move @skipUnless decoration to test itself

[Cleber Rosa]

----- Original Message -----
> From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
> To: "Alex Bennée" <alex.bennee@linaro.org>, qemu-devel@nongnu.org
> Cc: "Aurelien Jarno" <aurelien@aurel32.net>, f4bug@amsat.org, "Aleksandar Markovic" <amarkovic@wavecomp.com>
> Sent: Monday, March 2, 2020 1:14:31 PM
> Subject: Re: [PATCH] tests/acceptance: move @skipUnless decoration to test itself
> 
> On 3/2/20 7:09 PM, Alex Bennée wrote:
> > It appears ignore the decoration if just applied to the class.
> 
> Odd I remember testing this, this might be a feature supported by a
> newer Avocado version than the one available on Travis-CI.
> 
> > 
> > Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> > ---
> >   tests/acceptance/machine_mips_malta.py | 4 ++--
> >   1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/tests/acceptance/machine_mips_malta.py
> > b/tests/acceptance/machine_mips_malta.py
> > index 92b4f28a112..b8fac2a44d5 100644
> > --- a/tests/acceptance/machine_mips_malta.py
> > +++ b/tests/acceptance/machine_mips_malta.py
> > @@ -30,14 +30,14 @@ except ImportError:
> >       CV2_AVAILABLE = False
> >   
> >   
> > -@skipUnless(NUMPY_AVAILABLE, 'Python NumPy not installed')
> > -@skipUnless(CV2_AVAILABLE, 'Python OpenCV not installed')
> >   class MaltaMachineFramebuffer(Test):
> >   
> >       timeout = 30
> >   
> >       KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
> >   
> > +    @skipUnless(NUMPY_AVAILABLE, 'Python NumPy not installed')
> > +    @skipUnless(CV2_AVAILABLE, 'Python OpenCV not installed')
> >       def do_test_i6400_framebuffer_logo(self, cpu_cores_count):
> >           """
> >           Boot Linux kernel and check Tux logo is displayed on the
> >           framebuffer.
> > 
> 
> Unfortunately you have to also add it to the 7/8cores tests.
> 
> 
> 

This is true of Avocado < 76.0, but on 76.0 you can decorate the
class too:

https://avocado-framework.readthedocs.io/en/76.0/releases/76_0.html#users-test-writers

Maybe replace this patch and bump Avocado's version?

- Cleber.

Re: [PATCH] tests/acceptance: move @skipUnless decoration to test itself

[Alex Bennée]

Cleber Rosa <crosa@redhat.com> writes:

> ----- Original Message -----
>> From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
>> To: "Alex Bennée" <alex.bennee@linaro.org>, qemu-devel@nongnu.org
>> Cc: "Aurelien Jarno" <aurelien@aurel32.net>, f4bug@amsat.org, "Aleksandar Markovic" <amarkovic@wavecomp.com>
>> Sent: Monday, March 2, 2020 1:14:31 PM
>> Subject: Re: [PATCH] tests/acceptance: move @skipUnless decoration to test itself
>> 
>> On 3/2/20 7:09 PM, Alex Bennée wrote:
>> > It appears ignore the decoration if just applied to the class.
>> 
>> Odd I remember testing this, this might be a feature supported by a
>> newer Avocado version than the one available on Travis-CI.
>> 
>> > 
>> > Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>> > ---
>> >   tests/acceptance/machine_mips_malta.py | 4 ++--
>> >   1 file changed, 2 insertions(+), 2 deletions(-)
>> > 
>> > diff --git a/tests/acceptance/machine_mips_malta.py
>> > b/tests/acceptance/machine_mips_malta.py
>> > index 92b4f28a112..b8fac2a44d5 100644
>> > --- a/tests/acceptance/machine_mips_malta.py
>> > +++ b/tests/acceptance/machine_mips_malta.py
>> > @@ -30,14 +30,14 @@ except ImportError:
>> >       CV2_AVAILABLE = False
>> >   
>> >   
>> > -@skipUnless(NUMPY_AVAILABLE, 'Python NumPy not installed')
>> > -@skipUnless(CV2_AVAILABLE, 'Python OpenCV not installed')
>> >   class MaltaMachineFramebuffer(Test):
>> >   
>> >       timeout = 30
>> >   
>> >       KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
>> >   
>> > +    @skipUnless(NUMPY_AVAILABLE, 'Python NumPy not installed')
>> > +    @skipUnless(CV2_AVAILABLE, 'Python OpenCV not installed')
>> >       def do_test_i6400_framebuffer_logo(self, cpu_cores_count):
>> >           """
>> >           Boot Linux kernel and check Tux logo is displayed on the
>> >           framebuffer.
>> > 
>> 
>> Unfortunately you have to also add it to the 7/8cores tests.
>> 
>> 
>> 
>
> This is true of Avocado < 76.0, but on 76.0 you can decorate the
> class too:
>
> https://avocado-framework.readthedocs.io/en/76.0/releases/76_0.html#users-test-writers
>
> Maybe replace this patch and bump Avocado's version?

Where is this defined in the source?

>
> - Cleber.


-- 
Alex Bennée

Re: [PATCH] tests/acceptance: move @skipUnless decoration to test itself

[Cleber Rosa]

----- Original Message -----
> From: "Alex Bennée" <alex.bennee@linaro.org>
> To: "Cleber Rosa" <crosa@redhat.com>
> Cc: "Philippe Mathieu-Daudé" <philmd@redhat.com>, qemu-devel@nongnu.org, "Aurelien Jarno" <aurelien@aurel32.net>,
> f4bug@amsat.org, "Aleksandar Markovic" <amarkovic@wavecomp.com>
> Sent: Tuesday, March 3, 2020 8:59:47 AM
> Subject: Re: [PATCH] tests/acceptance: move @skipUnless decoration to test itself
> 
> 
> Cleber Rosa <crosa@redhat.com> writes:
> 
> > ----- Original Message -----
> >> From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
> >> To: "Alex Bennée" <alex.bennee@linaro.org>, qemu-devel@nongnu.org
> >> Cc: "Aurelien Jarno" <aurelien@aurel32.net>, f4bug@amsat.org, "Aleksandar
> >> Markovic" <amarkovic@wavecomp.com>
> >> Sent: Monday, March 2, 2020 1:14:31 PM
> >> Subject: Re: [PATCH] tests/acceptance: move @skipUnless decoration to test
> >> itself
> >> 
> >> On 3/2/20 7:09 PM, Alex Bennée wrote:
> >> > It appears ignore the decoration if just applied to the class.
> >> 
> >> Odd I remember testing this, this might be a feature supported by a
> >> newer Avocado version than the one available on Travis-CI.
> >> 
> >> > 
> >> > Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> >> > ---
> >> >   tests/acceptance/machine_mips_malta.py | 4 ++--
> >> >   1 file changed, 2 insertions(+), 2 deletions(-)
> >> > 
> >> > diff --git a/tests/acceptance/machine_mips_malta.py
> >> > b/tests/acceptance/machine_mips_malta.py
> >> > index 92b4f28a112..b8fac2a44d5 100644
> >> > --- a/tests/acceptance/machine_mips_malta.py
> >> > +++ b/tests/acceptance/machine_mips_malta.py
> >> > @@ -30,14 +30,14 @@ except ImportError:
> >> >       CV2_AVAILABLE = False
> >> >   
> >> >   
> >> > -@skipUnless(NUMPY_AVAILABLE, 'Python NumPy not installed')
> >> > -@skipUnless(CV2_AVAILABLE, 'Python OpenCV not installed')
> >> >   class MaltaMachineFramebuffer(Test):
> >> >   
> >> >       timeout = 30
> >> >   
> >> >       KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
> >> >   
> >> > +    @skipUnless(NUMPY_AVAILABLE, 'Python NumPy not installed')
> >> > +    @skipUnless(CV2_AVAILABLE, 'Python OpenCV not installed')
> >> >       def do_test_i6400_framebuffer_logo(self, cpu_cores_count):
> >> >           """
> >> >           Boot Linux kernel and check Tux logo is displayed on the
> >> >           framebuffer.
> >> > 
> >> 
> >> Unfortunately you have to also add it to the 7/8cores tests.
> >> 
> >> 
> >> 
> >
> > This is true of Avocado < 76.0, but on 76.0 you can decorate the
> > class too:
> >
> > https://avocado-framework.readthedocs.io/en/76.0/releases/76_0.html#users-test-writers
> >
> > Maybe replace this patch and bump Avocado's version?
> 
> Where is this defined in the source?
> 

It's defined at tests/requirements.txt.

- Cleber.

> >
> > - Cleber.
> 
> 
> --
> Alex Bennée
> 
> 

Re: [PATCH] tests/acceptance: move @skipUnless decoration to test itself

[Alex Bennée]

Aleksandar Markovic <aleksandar.m.mail@gmail.com> writes:

> 12:22 AM Uto, 03.03.2020. Philippe Mathieu-Daudé <philmd@redhat.com> је
> написао/ла:
>>
>> From: Alex Bennée <alex.bennee@linaro.org>
>>
>> It appears ignore the decoration if just applied to the class.
>>
>> Fixes: 0484d9d4fbe9beacd
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>> [PMD: Move decorations to each test function]
>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>> ---
>
> Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>
>
> Alex, please accept this most complete version. Many thanks,
> Aleksandar

Queued to testing/next, thanks.

>
>>  tests/acceptance/machine_mips_malta.py | 8 ++++++--
>>  1 file changed, 6 insertions(+), 2 deletions(-)
>>
>> diff --git a/tests/acceptance/machine_mips_malta.py
> b/tests/acceptance/machine_mips_malta.py
>> index 92b4f28a11..98463f7757 100644
>> --- a/tests/acceptance/machine_mips_malta.py
>> +++ b/tests/acceptance/machine_mips_malta.py
>> @@ -30,8 +30,6 @@
>>      CV2_AVAILABLE = False
>>
>>
>> -@skipUnless(NUMPY_AVAILABLE, 'Python NumPy not installed')
>> -@skipUnless(CV2_AVAILABLE, 'Python OpenCV not installed')
>>  class MaltaMachineFramebuffer(Test):
>>
>>      timeout = 30
>> @@ -91,6 +89,8 @@ def do_test_i6400_framebuffer_logo(self,
> cpu_cores_count):
>>              cv2.imwrite(debug_png, screendump_bgr)
>>          self.assertGreaterEqual(tuxlogo_count, cpu_cores_count)
>>
>> +    @skipUnless(NUMPY_AVAILABLE, 'Python NumPy not installed')
>> +    @skipUnless(CV2_AVAILABLE, 'Python OpenCV not installed')
>>      def test_mips_malta_i6400_framebuffer_logo_1core(self):
>>          """
>>          :avocado: tags=arch:mips64el
>> @@ -99,6 +99,8 @@ def test_mips_malta_i6400_framebuffer_logo_1core(self):
>>          """
>>          self.do_test_i6400_framebuffer_logo(1)
>>
>> +    @skipUnless(NUMPY_AVAILABLE, 'Python NumPy not installed')
>> +    @skipUnless(CV2_AVAILABLE, 'Python OpenCV not installed')
>>      def test_mips_malta_i6400_framebuffer_logo_7cores(self):
>>          """
>>          :avocado: tags=arch:mips64el
>> @@ -108,6 +110,8 @@ def
> test_mips_malta_i6400_framebuffer_logo_7cores(self):
>>          """
>>          self.do_test_i6400_framebuffer_logo(7)
>>
>> +    @skipUnless(NUMPY_AVAILABLE, 'Python NumPy not installed')
>> +    @skipUnless(CV2_AVAILABLE, 'Python OpenCV not installed')
>>      def test_mips_malta_i6400_framebuffer_logo_8cores(self):
>>          """
>>          :avocado: tags=arch:mips64el
>> --
>> 2.21.1
>>
>>


-- 
Alex Bennée

Re: [PATCH] tests/acceptance: move @skipUnless decoration to test itself

[Aleksandar Markovic]

[-- Attachment #1: Type: text/plain, Size: 2441 bytes --]

12:22 AM Uto, 03.03.2020. Philippe Mathieu-Daudé <philmd@redhat.com> је
написао/ла:
>
> From: Alex Bennée <alex.bennee@linaro.org>
>
> It appears ignore the decoration if just applied to the class.
>
> Fixes: 0484d9d4fbe9beacd
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> [PMD: Move decorations to each test function]
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---

Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>

Alex, please accept this most complete version. Many thanks, Aleksandar

>  tests/acceptance/machine_mips_malta.py | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/tests/acceptance/machine_mips_malta.py
b/tests/acceptance/machine_mips_malta.py
> index 92b4f28a11..98463f7757 100644
> --- a/tests/acceptance/machine_mips_malta.py
> +++ b/tests/acceptance/machine_mips_malta.py
> @@ -30,8 +30,6 @@
>      CV2_AVAILABLE = False
>
>
> -@skipUnless(NUMPY_AVAILABLE, 'Python NumPy not installed')
> -@skipUnless(CV2_AVAILABLE, 'Python OpenCV not installed')
>  class MaltaMachineFramebuffer(Test):
>
>      timeout = 30
> @@ -91,6 +89,8 @@ def do_test_i6400_framebuffer_logo(self,
cpu_cores_count):
>              cv2.imwrite(debug_png, screendump_bgr)
>          self.assertGreaterEqual(tuxlogo_count, cpu_cores_count)
>
> +    @skipUnless(NUMPY_AVAILABLE, 'Python NumPy not installed')
> +    @skipUnless(CV2_AVAILABLE, 'Python OpenCV not installed')
>      def test_mips_malta_i6400_framebuffer_logo_1core(self):
>          """
>          :avocado: tags=arch:mips64el
> @@ -99,6 +99,8 @@ def test_mips_malta_i6400_framebuffer_logo_1core(self):
>          """
>          self.do_test_i6400_framebuffer_logo(1)
>
> +    @skipUnless(NUMPY_AVAILABLE, 'Python NumPy not installed')
> +    @skipUnless(CV2_AVAILABLE, 'Python OpenCV not installed')
>      def test_mips_malta_i6400_framebuffer_logo_7cores(self):
>          """
>          :avocado: tags=arch:mips64el
> @@ -108,6 +110,8 @@ def
test_mips_malta_i6400_framebuffer_logo_7cores(self):
>          """
>          self.do_test_i6400_framebuffer_logo(7)
>
> +    @skipUnless(NUMPY_AVAILABLE, 'Python NumPy not installed')
> +    @skipUnless(CV2_AVAILABLE, 'Python OpenCV not installed')
>      def test_mips_malta_i6400_framebuffer_logo_8cores(self):
>          """
>          :avocado: tags=arch:mips64el
> --
> 2.21.1
>
>

[-- Attachment #2: Type: text/html, Size: 3395 bytes --]

[PATCH] tests/acceptance: move @skipUnless decoration to test itself

[Philippe Mathieu-Daudé]

From: Alex Bennée <alex.bennee@linaro.org>

It appears ignore the decoration if just applied to the class.

Fixes: 0484d9d4fbe9beacd
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
[PMD: Move decorations to each test function]
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 tests/acceptance/machine_mips_malta.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/acceptance/machine_mips_malta.py b/tests/acceptance/machine_mips_malta.py
index 92b4f28a11..98463f7757 100644
--- a/tests/acceptance/machine_mips_malta.py
+++ b/tests/acceptance/machine_mips_malta.py
@@ -30,8 +30,6 @@
     CV2_AVAILABLE = False
 
 
-@skipUnless(NUMPY_AVAILABLE, 'Python NumPy not installed')
-@skipUnless(CV2_AVAILABLE, 'Python OpenCV not installed')
 class MaltaMachineFramebuffer(Test):
 
     timeout = 30
@@ -91,6 +89,8 @@ def do_test_i6400_framebuffer_logo(self, cpu_cores_count):
             cv2.imwrite(debug_png, screendump_bgr)
         self.assertGreaterEqual(tuxlogo_count, cpu_cores_count)
 
+    @skipUnless(NUMPY_AVAILABLE, 'Python NumPy not installed')
+    @skipUnless(CV2_AVAILABLE, 'Python OpenCV not installed')
     def test_mips_malta_i6400_framebuffer_logo_1core(self):
         """
         :avocado: tags=arch:mips64el
@@ -99,6 +99,8 @@ def test_mips_malta_i6400_framebuffer_logo_1core(self):
         """
         self.do_test_i6400_framebuffer_logo(1)
 
+    @skipUnless(NUMPY_AVAILABLE, 'Python NumPy not installed')
+    @skipUnless(CV2_AVAILABLE, 'Python OpenCV not installed')
     def test_mips_malta_i6400_framebuffer_logo_7cores(self):
         """
         :avocado: tags=arch:mips64el
@@ -108,6 +110,8 @@ def test_mips_malta_i6400_framebuffer_logo_7cores(self):
         """
         self.do_test_i6400_framebuffer_logo(7)
 
+    @skipUnless(NUMPY_AVAILABLE, 'Python NumPy not installed')
+    @skipUnless(CV2_AVAILABLE, 'Python OpenCV not installed')
     def test_mips_malta_i6400_framebuffer_logo_8cores(self):
         """
         :avocado: tags=arch:mips64el
-- 
2.21.1