ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests/avocado/machine_s390_ccw_virtio: Skip the flaky virtio-gpu test by default 

The virtio-gpu test is known to be flaky - that's why we also did
not enable the test_s390x_fedora in the gitlab CI. However, a flaky
test can also be annoying when testing locally, so let's rather skip
this subtest by default and start running the test_s390x_fedora test
in the gitlab CI again (since the other things that are tested here
are quite valuable).

Message-Id: <20230724084851.24251-1-thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2023-07-24 10:48:51 +02:00
parent c34ad45992
commit bd39b7b5f3
1 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
tests/avocado/machine_s390_ccw_virtio.py
View File

@ -159,7 +159,6 @@ class S390CCWVirtioMachine(QemuSystemTest):
'MemTotal: 115640 kB') 'MemTotal: 115640 kB')
@skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab')
def test_s390x_fedora(self): def test_s390x_fedora(self):
""" """
@ -229,31 +228,35 @@ class S390CCWVirtioMachine(QemuSystemTest):
# writing to the framebuffer. Since the PPM is uncompressed, we then # writing to the framebuffer. Since the PPM is uncompressed, we then
# can simply read the written "magic bytes" back from the PPM file to # can simply read the written "magic bytes" back from the PPM file to
# check whether the framebuffer is working as expected. # check whether the framebuffer is working as expected.
self.log.info("Test screendump of virtio-gpu device") # Unfortunately, this test is flaky, so we don't run it by default
exec_command_and_wait_for_pattern(self, if os.getenv('QEMU_TEST_FLAKY_TESTS'):
self.log.info("Test screendump of virtio-gpu device")
exec_command_and_wait_for_pattern(self,
'while ! (dmesg | grep gpudrmfb) ; do sleep 1 ; done', 'while ! (dmesg | grep gpudrmfb) ; do sleep 1 ; done',
'virtio_gpudrmfb frame buffer device') 'virtio_gpudrmfb frame buffer device')
exec_command_and_wait_for_pattern(self, exec_command_and_wait_for_pattern(self,
'echo -e "\e[?25l" > /dev/tty0', ':/#') 'echo -e "\e[?25l" > /dev/tty0', ':/#')
exec_command_and_wait_for_pattern(self, 'for ((i=0;i<250;i++)); do ' exec_command_and_wait_for_pattern(self, 'for ((i=0;i<250;i++)); do '
'echo " The qu ick fo x j ump s o ver a laz y d og" >> fox.txt;' 'echo " The qu ick fo x j ump s o ver a laz y d og" >> fox.txt;'
'done', 'done',
':/#') ':/#')
exec_command_and_wait_for_pattern(self, exec_command_and_wait_for_pattern(self,
'dd if=fox.txt of=/dev/fb0 bs=1000 oflag=sync,nocache ; rm fox.txt', 'dd if=fox.txt of=/dev/fb0 bs=1000 oflag=sync,nocache ; rm fox.txt',
'12+0 records out') '12+0 records out')
with tempfile.NamedTemporaryFile(suffix='.ppm', with tempfile.NamedTemporaryFile(suffix='.ppm',
prefix='qemu-scrdump-') as ppmfile: prefix='qemu-scrdump-') as ppmfile:
self.vm.command('screendump', filename=ppmfile.name) self.vm.command('screendump', filename=ppmfile.name)
ppmfile.seek(0) ppmfile.seek(0)
line = ppmfile.readline() line = ppmfile.readline()
self.assertEqual(line, b"P6\n") self.assertEqual(line, b"P6\n")
line = ppmfile.readline() line = ppmfile.readline()
self.assertEqual(line, b"1280 800\n") self.assertEqual(line, b"1280 800\n")
line = ppmfile.readline() line = ppmfile.readline()
self.assertEqual(line, b"255\n") self.assertEqual(line, b"255\n")
line = ppmfile.readline(256) line = ppmfile.readline(256)
self.assertEqual(line, b"The quick fox jumps over a lazy dog\n") self.assertEqual(line, b"The quick fox jumps over a lazy dog\n")
else:
self.log.info("Skipped flaky screendump of virtio-gpu device test")
# Hot-plug a virtio-crypto device and see whether it gets accepted # Hot-plug a virtio-crypto device and see whether it gets accepted
self.log.info("Test hot-plug virtio-crypto device") self.log.info("Test hot-plug virtio-crypto device")