mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/functional: Convert avocado tests that just need a small adjustment

Browse Source 
These simple tests can be converted to stand-alone tests quite easily,
e.g. by just setting the machine to 'none' now manually or by adding
"-cpu" command line parameters, since we don't support the corresponding
avocado tags in the new python test framework.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240830133841.142644-14-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2024-08-30 15:38:07 +02:00
parent cce85725f1
commit eeba3d7365
5 changed files with 56 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MAINTAINERS
View File

@ -318,6 +318,7 @@ F: configs/devices/ppc*
F: docs/system/ppc/embedded.rst
F: docs/system/target-ppc.rst
F: tests/tcg/ppc*/*
F: tests/functional/test_ppc_74xx.py
RISC-V TCG CPUs
M: Palmer Dabbelt <palmer@dabbelt.com>
@ -2107,6 +2108,7 @@ S: Odd Fixes
F: hw/net/
F: include/hw/net/
F: tests/qtest/virtio-net-test.c
F: tests/functional/test_info_usernet.py
F: docs/virtio-net-failover.rst
T: git https://github.com/jasowang/qemu.git net
@ -2976,6 +2978,7 @@ S: Supported
F: include/qemu/option.h
F: tests/unit/test-keyval.c
F: tests/unit/test-qemu-opts.c
F: tests/functional/test_version.py
F: util/keyval.c
F: util/qemu-option.c

6
tests/functional/meson.build
View File

@ -15,6 +15,12 @@ test_timeouts = {
tests_generic_system = [
'empty_cpu_model',
'info_usernet',
'version',
]
tests_ppc_quick = [
'ppc_74xx',
]
tests_generic_linuxuser = [

11
tests/avocado/info_usernet.py → tests/functional/test_info_usernet.py Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env python3
#
# Test for the hmp command "info usernet"
#
# Copyright (c) 2021 Red Hat, Inc.
@ -8,18 +10,16 @@
# This work is licensed under the terms of the GNU GPL, version 2 or
# later. See the COPYING file in the top-level directory.
from avocado_qemu import QemuSystemTest
from qemu_test import QemuSystemTest
from qemu.utils import get_info_usernet_hostfwd_port
class InfoUsernet(QemuSystemTest):
"""
:avocado: tags=machine:none
"""
def test_hostfwd(self):
self.require_netdev('user')
self.set_machine('none')
self.vm.add_args('-netdev', 'user,id=vnet,hostfwd=:127.0.0.1:0-:22')
self.vm.launch()
res = self.vm.cmd('human-monitor-command',
@ -31,3 +31,6 @@ class InfoUsernet(QemuSystemTest):
self.assertGreater(port, 0,
('Found a redirected port that is not greater than'
' zero'))
if __name__ == '__main__':
QemuSystemTest.main()

74
tests/avocado/ppc_74xx.py → tests/functional/test_ppc_74xx.py Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env python3
#
# Smoke tests for 74xx cpus (aka G4).
#
# Copyright (c) 2021, IBM Corp.
@ -5,132 +7,120 @@
# This work is licensed under the terms of the GNU GPL, version 2 or
# later. See the COPYING file in the top-level directory.
from avocado_qemu import QemuSystemTest
from avocado_qemu import wait_for_console_pattern
from qemu_test import QemuSystemTest
from qemu_test import wait_for_console_pattern
class ppc74xxCpu(QemuSystemTest):
"""
:avocado: tags=arch:ppc
:avocado: tags=accel:tcg
"""
timeout = 5
def test_ppc_7400(self):
"""
:avocado: tags=cpu:7400
"""
self.require_accelerator("tcg")
self.set_machine('g3beige')
self.vm.set_console()
self.vm.add_args('-cpu', '7400')
self.vm.launch()
wait_for_console_pattern(self, '>> OpenBIOS')
wait_for_console_pattern(self, '>> CPU type PowerPC,G4')
def test_ppc_7410(self):
"""
:avocado: tags=cpu:7410
"""
self.require_accelerator("tcg")
self.set_machine('g3beige')
self.vm.set_console()
self.vm.add_args('-cpu', '7410')
self.vm.launch()
wait_for_console_pattern(self, '>> OpenBIOS')
wait_for_console_pattern(self, '>> CPU type PowerPC,74xx')
def test_ppc_7441(self):
"""
:avocado: tags=cpu:7441
"""
self.require_accelerator("tcg")
self.set_machine('g3beige')
self.vm.set_console()
self.vm.add_args('-cpu', '7441')
self.vm.launch()
wait_for_console_pattern(self, '>> OpenBIOS')
wait_for_console_pattern(self, '>> CPU type PowerPC,G4')
def test_ppc_7445(self):
"""
:avocado: tags=cpu:7445
"""
self.require_accelerator("tcg")
self.set_machine('g3beige')
self.vm.set_console()
self.vm.add_args('-cpu', '7445')
self.vm.launch()
wait_for_console_pattern(self, '>> OpenBIOS')
wait_for_console_pattern(self, '>> CPU type PowerPC,G4')
def test_ppc_7447(self):
"""
:avocado: tags=cpu:7447
"""
self.require_accelerator("tcg")
self.set_machine('g3beige')
self.vm.set_console()
self.vm.add_args('-cpu', '7447')
self.vm.launch()
wait_for_console_pattern(self, '>> OpenBIOS')
wait_for_console_pattern(self, '>> CPU type PowerPC,G4')
def test_ppc_7447a(self):
"""
:avocado: tags=cpu:7447a
"""
self.require_accelerator("tcg")
self.set_machine('g3beige')
self.vm.set_console()
self.vm.add_args('-cpu', '7447a')
self.vm.launch()
wait_for_console_pattern(self, '>> OpenBIOS')
wait_for_console_pattern(self, '>> CPU type PowerPC,G4')
def test_ppc_7448(self):
"""
:avocado: tags=cpu:7448
"""
self.require_accelerator("tcg")
self.set_machine('g3beige')
self.vm.set_console()
self.vm.add_args('-cpu', '7448')
self.vm.launch()
wait_for_console_pattern(self, '>> OpenBIOS')
wait_for_console_pattern(self, '>> CPU type PowerPC,MPC86xx')
def test_ppc_7450(self):
"""
:avocado: tags=cpu:7450
"""
self.require_accelerator("tcg")
self.set_machine('g3beige')
self.vm.set_console()
self.vm.add_args('-cpu', '7450')
self.vm.launch()
wait_for_console_pattern(self, '>> OpenBIOS')
wait_for_console_pattern(self, '>> CPU type PowerPC,G4')
def test_ppc_7451(self):
"""
:avocado: tags=cpu:7451
"""
self.require_accelerator("tcg")
self.set_machine('g3beige')
self.vm.set_console()
self.vm.add_args('-cpu', '7451')
self.vm.launch()
wait_for_console_pattern(self, '>> OpenBIOS')
wait_for_console_pattern(self, '>> CPU type PowerPC,G4')
def test_ppc_7455(self):
"""
:avocado: tags=cpu:7455
"""
self.require_accelerator("tcg")
self.set_machine('g3beige')
self.vm.set_console()
self.vm.add_args('-cpu', '7455')
self.vm.launch()
wait_for_console_pattern(self, '>> OpenBIOS')
wait_for_console_pattern(self, '>> CPU type PowerPC,G4')
def test_ppc_7457(self):
"""
:avocado: tags=cpu:7457
"""
self.require_accelerator("tcg")
self.set_machine('g3beige')
self.vm.set_console()
self.vm.add_args('-cpu', '7457')
self.vm.launch()
wait_for_console_pattern(self, '>> OpenBIOS')
wait_for_console_pattern(self, '>> CPU type PowerPC,G4')
def test_ppc_7457a(self):
"""
:avocado: tags=cpu:7457a
"""
self.require_accelerator("tcg")
self.set_machine('g3beige')
self.vm.set_console()
self.vm.add_args('-cpu', '7457a')
self.vm.launch()
wait_for_console_pattern(self, '>> OpenBIOS')
wait_for_console_pattern(self, '>> CPU type PowerPC,G4')
if __name__ == '__main__':
QemuSystemTest.main()

13
tests/avocado/version.py → tests/functional/test_version.py Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env python3
#
# Version check example test
#
# Copyright (c) 2018 Red Hat, Inc.
@ -9,17 +11,18 @@
# later. See the COPYING file in the top-level directory.
from avocado_qemu import QemuSystemTest
from qemu_test import QemuSystemTest
class Version(QemuSystemTest):
"""
:avocado: tags=quick
:avocado: tags=machine:none
"""
def test_qmp_human_info_version(self):
self.set_machine('none')
self.vm.add_args('-nodefaults')
self.vm.launch()
res = self.vm.cmd('human-monitor-command',
command_line='info version')
self.assertRegex(res, r'^(\d+\.\d+\.\d)')
if __name__ == '__main__':
QemuSystemTest.main()