qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] tests/acceptance/virtio_check_params: Only disable the test on CI
@ 2020-02-11 10:49 Philippe Mathieu-Daudé
  2020-02-11 10:52 ` Cornelia Huck
  0 siblings, 1 reply; 2+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-02-11 10:49 UTC (permalink / raw)
  To: qemu-devel
  Cc: Denis Plotnikov, Cornelia Huck, Philippe Mathieu-Daudé,
	Wainer dos Santos Moschetta, Cleber Rosa

Commit 2d6a6e238a incorrectly totally disabled this test.
The original intention was to only disable on continuous integration.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 tests/acceptance/virtio_check_params.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/acceptance/virtio_check_params.py b/tests/acceptance/virtio_check_params.py
index 87e6c839d1..015582cf9c 100644
--- a/tests/acceptance/virtio_check_params.py
+++ b/tests/acceptance/virtio_check_params.py
@@ -25,7 +25,7 @@ import logging
 sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python'))
 from qemu.machine import QEMUMachine
 from avocado_qemu import Test
-from avocado import skip
+from avocado import skipIf
 
 #list of machine types and virtqueue properties to test
 VIRTIO_SCSI_PROPS = {'seg_max_adjust': 'seg_max_adjust'}
@@ -117,7 +117,7 @@ class VirtioMaxSegSettingsCheck(Test):
             return True
         return False
 
-    @skip("break multi-arch CI")
+    @skipIf(os.getenv('CONTINUOUS_INTEGRATION'), 'Break multi-arch CI')
     def test_machine_types(self):
         # collect all machine types except 'none', 'isapc', 'microvm'
         with QEMUMachine(self.qemu_bin) as vm:
-- 
2.21.1



^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] tests/acceptance/virtio_check_params: Only disable the test on CI
  2020-02-11 10:49 [PATCH] tests/acceptance/virtio_check_params: Only disable the test on CI Philippe Mathieu-Daudé
@ 2020-02-11 10:52 ` Cornelia Huck
  0 siblings, 0 replies; 2+ messages in thread
From: Cornelia Huck @ 2020-02-11 10:52 UTC (permalink / raw)
  To: Philippe Mathieu-Daudé
  Cc: Denis Plotnikov, qemu-devel, Wainer dos Santos Moschetta,
	Cleber Rosa

On Tue, 11 Feb 2020 11:49:38 +0100
Philippe Mathieu-Daudé <philmd@redhat.com> wrote:

> Commit 2d6a6e238a incorrectly totally disabled this test.
> The original intention was to only disable on continuous integration.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  tests/acceptance/virtio_check_params.py | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/acceptance/virtio_check_params.py b/tests/acceptance/virtio_check_params.py
> index 87e6c839d1..015582cf9c 100644
> --- a/tests/acceptance/virtio_check_params.py
> +++ b/tests/acceptance/virtio_check_params.py
> @@ -25,7 +25,7 @@ import logging
>  sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python'))
>  from qemu.machine import QEMUMachine
>  from avocado_qemu import Test
> -from avocado import skip
> +from avocado import skipIf
>  
>  #list of machine types and virtqueue properties to test
>  VIRTIO_SCSI_PROPS = {'seg_max_adjust': 'seg_max_adjust'}
> @@ -117,7 +117,7 @@ class VirtioMaxSegSettingsCheck(Test):
>              return True
>          return False
>  
> -    @skip("break multi-arch CI")
> +    @skipIf(os.getenv('CONTINUOUS_INTEGRATION'), 'Break multi-arch CI')
>      def test_machine_types(self):
>          # collect all machine types except 'none', 'isapc', 'microvm'
>          with QEMUMachine(self.qemu_bin) as vm:

Acked-by: Cornelia Huck <cohuck@redhat.com>



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-02-11 10:53 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-02-11 10:49 [PATCH] tests/acceptance/virtio_check_params: Only disable the test on CI Philippe Mathieu-Daudé
2020-02-11 10:52 ` Cornelia Huck

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).