diff mbox series

tests/acceptance: move @skipUnless decoration to test itself

Message ID 20200302232220.761-1-philmd@redhat.com (mailing list archive)
State New, archived
Headers show
Series tests/acceptance: move @skipUnless decoration to test itself | expand

Commit Message

Philippe Mathieu-Daudé March 2, 2020, 11:22 p.m. UTC 
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(-)

Comments

Aleksandar Markovic March 3, 2020, 9:42 a.m. UTC | #1 
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
>
>
Alex Bennée March 3, 2020, 10:24 a.m. UTC | #2 
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
>>
>>
diff mbox series

Patch

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