mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-05 00:33:55 -06:00
tests/avocado: mark boot_linux.py long runtime instead of flaky
The ppc64 and s390x tests were first marked skipIf GITLAB_CI by commitc0c8687ef0
("tests/avocado: disable BootLinuxPPC64 test in CI"), and commit0f26d94ec9
("tests/acceptance: skip s390x_ccw_vrtio_tcg on GitLab") due to being very heavy-weight for gitlab CI. Commit9b45cc9931
("docs/devel: rationalise unstable gitlab tests under FLAKY_TESTS") changed this to being flaky but it isn't really, it just had a long runtime. So take the SPEED=slow variable from qtests and introduce it to avocado, and make these tests require it. Reviewed-by: Cédric Le Goater <clg@kaod.org> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
This commit is contained in:
parent
c8fd9667e5
commit
e5f1500144
2 changed files with 13 additions and 6 deletions
|
@ -93,13 +93,11 @@ class BootLinuxPPC64(LinuxTest):
|
|||
|
||||
timeout = 360
|
||||
|
||||
@skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test is unstable on GitLab')
|
||||
|
||||
@skipUnless(os.getenv('SPEED') == 'slow', 'runtime limited')
|
||||
def test_pseries_tcg(self):
|
||||
"""
|
||||
:avocado: tags=machine:pseries
|
||||
:avocado: tags=accel:tcg
|
||||
:avocado: tags=flaky
|
||||
"""
|
||||
self.require_accelerator("tcg")
|
||||
self.vm.add_args("-accel", "tcg")
|
||||
|
@ -113,13 +111,11 @@ class BootLinuxS390X(LinuxTest):
|
|||
|
||||
timeout = 240
|
||||
|
||||
@skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test is unstable on GitLab')
|
||||
|
||||
@skipUnless(os.getenv('SPEED') == 'slow', 'runtime limited')
|
||||
def test_s390_ccw_virtio_tcg(self):
|
||||
"""
|
||||
:avocado: tags=machine:s390-ccw-virtio
|
||||
:avocado: tags=accel:tcg
|
||||
:avocado: tags=flaky
|
||||
"""
|
||||
self.require_accelerator("tcg")
|
||||
self.vm.add_args("-accel", "tcg")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue