| Message ID | 20200211104938.12068-1-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | tests/acceptance/virtio_check_params: Only disable the test on CI | expand |
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>
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:
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(-)