SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests/functional: Convert the s390x avocado tests into standalone tests

Browse Source 
These tests use archive.lzma_uncompress() from the Avocado utils,
so provide a small helper function for this, based on the
standard lzma module from Python instead.

And while we're at it, replace the MD5 hashes in the topology test
with proper SHA256 hashes, since MD5 should not be used anymore
nowadays.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20240830133841.142644-21-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2024-08-30 15:38:14 +02:00
parent e3fc99b164
commit e2e9fd256e
5 changed files with 94 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MAINTAINERS
View File

@ -1743,7 +1743,7 @@ S: Supported
F: hw/s390x/ F: hw/s390x/
F: include/hw/s390x/ F: include/hw/s390x/
F: configs/devices/s390x-softmmu/default.mak F: configs/devices/s390x-softmmu/default.mak
F: tests/avocado/machine_s390_ccw_virtio.py F: tests/functional/test_s390x_ccw_virtio.py
T: git https://github.com/borntraeger/qemu.git s390-next T: git https://github.com/borntraeger/qemu.git s390-next
L: qemu-s390x@nongnu.org L: qemu-s390x@nongnu.org
@ -1806,7 +1806,7 @@ F: hw/s390x/cpu-topology.c
F: target/s390x/kvm/stsi-topology.c F: target/s390x/kvm/stsi-topology.c
F: docs/devel/s390-cpu-topology.rst F: docs/devel/s390-cpu-topology.rst
F: docs/system/s390x/cpu-topology.rst F: docs/system/s390x/cpu-topology.rst
F: tests/avocado/s390_topology.py F: tests/functional/test_s390x_topology.py
X86 Machines X86 Machines
------------ ------------

6
tests/functional/meson.build
View File

@ -12,6 +12,7 @@ endif
# Timeouts for individual tests that can be slow e.g. with debugging enabled # Timeouts for individual tests that can be slow e.g. with debugging enabled
test_timeouts = { test_timeouts = {
'netdev_ethtool' : 180, 'netdev_ethtool' : 180,
's390x_ccw_virtio' : 180,
} }
tests_generic_system = [ tests_generic_system = [
@ -51,6 +52,11 @@ tests_ppc_system_thorough = [
'ppc_bamboo', 'ppc_bamboo',
] ]
tests_s390x_system_thorough = [
's390x_ccw_virtio',
's390x_topology',
]
tests_sparc64_system_thorough = [ tests_sparc64_system_thorough = [
'sparc64_sun4u', 'sparc64_sun4u',
] ]

14
tests/functional/qemu_test/utils.py
View File

@ -8,6 +8,9 @@
# This work is licensed under the terms of the GNU GPL, version 2 or # This work is licensed under the terms of the GNU GPL, version 2 or
# later. See the COPYING file in the top-level directory. # later. See the COPYING file in the top-level directory.
import lzma
import os
import shutil
import tarfile import tarfile
def archive_extract(archive, dest_dir, member=None): def archive_extract(archive, dest_dir, member=None):
@ -19,3 +22,14 @@ def archive_extract(archive, dest_dir, member=None):
tf.extract(member=member, path=dest_dir) tf.extract(member=member, path=dest_dir)
else: else:
tf.extractall(path=dest_dir) tf.extractall(path=dest_dir)
def lzma_uncompress(xz_path, output_path):
if os.path.exists(output_path):
return
with lzma.open(xz_path, 'rb') as lzma_in:
try:
with open(output_path, 'wb') as raw_out:
shutil.copyfileobj(lzma_in, raw_out)
except:
os.remove(output_path)
raise

79
tests/avocado/machine_s390_ccw_virtio.py → tests/functional/test_s390x_ccw_virtio.py Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env python3
#
# Functional test that boots an s390x Linux guest with ccw and PCI devices # Functional test that boots an s390x Linux guest with ccw and PCI devices
# attached and checks whether the devices are recognized by Linux # attached and checks whether the devices are recognized by Linux
# #
@ -12,17 +14,38 @@
import os import os
import tempfile import tempfile
from avocado import skipUnless from qemu_test import QemuSystemTest, Asset
from avocado_qemu import QemuSystemTest from qemu_test import exec_command_and_wait_for_pattern
from avocado_qemu import exec_command_and_wait_for_pattern from qemu_test import wait_for_console_pattern
from avocado_qemu import wait_for_console_pattern from qemu_test.utils import lzma_uncompress
from avocado.utils import archive
class S390CCWVirtioMachine(QemuSystemTest): class S390CCWVirtioMachine(QemuSystemTest):
KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 ' KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
timeout = 120 timeout = 120
ASSET_BUSTER_KERNEL = Asset(
('https://snapshot.debian.org/archive/debian/'
'20201126T092837Z/dists/buster/main/installer-s390x/'
'20190702+deb10u6/images/generic/kernel.debian'),
'd411d17c39ae7ad38d27534376cbe88b68b403c325739364122c2e6f1537e818')
ASSET_BUSTER_INITRD = Asset(
('https://snapshot.debian.org/archive/debian/'
'20201126T092837Z/dists/buster/main/installer-s390x/'
'20190702+deb10u6/images/generic/initrd.debian'),
'836bbd0fe6a5ca81274c28c2b063ea315ce1868660866e9b60180c575fef9fd5')
ASSET_F31_KERNEL = Asset(
('https://archives.fedoraproject.org/pub/archive'
'/fedora-secondary/releases/31/Server/s390x/os'
'/images/kernel.img'),
'480859574f3f44caa6cd35c62d70e1ac0609134e22ce2a954bbed9b110c06e0b')
ASSET_F31_INITRD = Asset(
('https://archives.fedoraproject.org/pub/archive'
'/fedora-secondary/releases/31/Server/s390x/os'
'/images/initrd.img'),
'04c46095b2c49020b1c2327158898b7db747e4892ae319726192fb949716aa9c')
def wait_for_console_pattern(self, success_message, vm=None): def wait_for_console_pattern(self, success_message, vm=None):
wait_for_console_pattern(self, success_message, wait_for_console_pattern(self, success_message,
failure_message='Kernel panic - not syncing', failure_message='Kernel panic - not syncing',
@ -41,23 +64,10 @@ class S390CCWVirtioMachine(QemuSystemTest):
self.dmesg_clear_count += 1 self.dmesg_clear_count += 1
def test_s390x_devices(self): def test_s390x_devices(self):
self.set_machine('s390-ccw-virtio')
""" kernel_path = self.ASSET_BUSTER_KERNEL.fetch()
:avocado: tags=arch:s390x initrd_path = self.ASSET_BUSTER_INITRD.fetch()
:avocado: tags=machine:s390-ccw-virtio
"""
kernel_url = ('https://snapshot.debian.org/archive/debian/'
'20201126T092837Z/dists/buster/main/installer-s390x/'
'20190702+deb10u6/images/generic/kernel.debian')
kernel_hash = '5821fbee57d6220a067a8b967d24595621aa1eb6'
kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
initrd_url = ('https://snapshot.debian.org/archive/debian/'
'20201126T092837Z/dists/buster/main/installer-s390x/'
'20190702+deb10u6/images/generic/initrd.debian')
initrd_hash = '81ba09c97bef46e8f4660ac25b4ac0a5be3a94d6'
initrd_path = self.fetch_asset(initrd_url, asset_hash=initrd_hash)
self.vm.set_console() self.vm.set_console()
kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
@ -160,29 +170,13 @@ class S390CCWVirtioMachine(QemuSystemTest):
def test_s390x_fedora(self): def test_s390x_fedora(self):
self.set_machine('s390-ccw-virtio')
""" kernel_path = self.ASSET_F31_KERNEL.fetch()
:avocado: tags=arch:s390x
:avocado: tags=machine:s390-ccw-virtio
:avocado: tags=device:virtio-gpu
:avocado: tags=device:virtio-crypto
:avocado: tags=device:virtio-net
:avocado: tags=flaky
"""
kernel_url = ('https://archives.fedoraproject.org/pub/archive' initrd_path_xz = self.ASSET_F31_INITRD.fetch()
'/fedora-secondary/releases/31/Server/s390x/os'
'/images/kernel.img')
kernel_hash = 'b93d1efcafcf29c1673a4ce371a1f8b43941cfeb'
kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
initrd_url = ('https://archives.fedoraproject.org/pub/archive'
'/fedora-secondary/releases/31/Server/s390x/os'
'/images/initrd.img')
initrd_hash = '3de45d411df5624b8d8ef21cd0b44419ab59b12f'
initrd_path_xz = self.fetch_asset(initrd_url, asset_hash=initrd_hash)
initrd_path = os.path.join(self.workdir, 'initrd-raw.img') initrd_path = os.path.join(self.workdir, 'initrd-raw.img')
archive.lzma_uncompress(initrd_path_xz, initrd_path) lzma_uncompress(initrd_path_xz, initrd_path)
self.vm.set_console() self.vm.set_console()
kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + ' audit=0 ' kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + ' audit=0 '
@ -277,3 +271,6 @@ class S390CCWVirtioMachine(QemuSystemTest):
exec_command_and_wait_for_pattern(self, exec_command_and_wait_for_pattern(self,
'while ! (dmesg -c | grep Start.virtcrypto_remove) ; do' 'while ! (dmesg -c | grep Start.virtcrypto_remove) ; do'
' sleep 1 ; done', 'Start virtcrypto_remove.') ' sleep 1 ; done', 'Start virtcrypto_remove.')
if __name__ == '__main__':
QemuSystemTest.main()

86
tests/avocado/s390_topology.py → tests/functional/test_s390x_topology.py Normal file → Executable file
View File

@ -1,3 +1,5 @@
#!/usr/bin/env python3
#
# Functional test that boots a Linux kernel and checks the console # Functional test that boots a Linux kernel and checks the console
# #
# Copyright IBM Corp. 2023 # Copyright IBM Corp. 2023
@ -9,16 +11,13 @@
# later. See the COPYING file in the top-level directory. # later. See the COPYING file in the top-level directory.
import os import os
import shutil
import time import time
from avocado_qemu import QemuSystemTest from qemu_test import QemuSystemTest, Asset
from avocado_qemu import exec_command from qemu_test import exec_command
from avocado_qemu import exec_command_and_wait_for_pattern from qemu_test import exec_command_and_wait_for_pattern
from avocado_qemu import interrupt_interactive_console_until_pattern from qemu_test import wait_for_console_pattern
from avocado_qemu import wait_for_console_pattern from qemu_test.utils import lzma_uncompress
from avocado.utils import process
from avocado.utils import archive
class S390CPUTopology(QemuSystemTest): class S390CPUTopology(QemuSystemTest):
@ -47,6 +46,17 @@ class S390CPUTopology(QemuSystemTest):
'root=/dev/ram ' 'root=/dev/ram '
'selinux=0 ' 'selinux=0 '
'rdinit=/bin/sh') 'rdinit=/bin/sh')
ASSET_F35_KERNEL = Asset(
('https://archives.fedoraproject.org/pub/archive'
'/fedora-secondary/releases/35/Server/s390x/os'
'/images/kernel.img'),
'1f2dddfd11bb1393dd2eb2e784036fbf6fc11057a6d7d27f9eb12d3edc67ef73')
ASSET_F35_INITRD = Asset(
('https://archives.fedoraproject.org/pub/archive'
'/fedora-secondary/releases/35/Server/s390x/os'
'/images/initrd.img'),
'1100145fbca00240c8c372ae4b89b48c99844bc189b3dfbc3f481dc60055ca46')
def wait_until_booted(self): def wait_until_booted(self):
wait_for_console_pattern(self, 'no job control', wait_for_console_pattern(self, 'no job control',
@ -78,21 +88,10 @@ class S390CPUTopology(QemuSystemTest):
We need a minimal root filesystem with a shell. We need a minimal root filesystem with a shell.
""" """
self.require_accelerator("kvm") self.require_accelerator("kvm")
kernel_url = ('https://archives.fedoraproject.org/pub/archive' kernel_path = self.ASSET_F35_KERNEL.fetch()
'/fedora-secondary/releases/35/Server/s390x/os' initrd_path_xz = self.ASSET_F35_INITRD.fetch()
'/images/kernel.img')
kernel_hash = '0d1aaaf303f07cf0160c8c48e56fe638'
kernel_path = self.fetch_asset(kernel_url, algorithm='md5',
asset_hash=kernel_hash)
initrd_url = ('https://archives.fedoraproject.org/pub/archive'
'/fedora-secondary/releases/35/Server/s390x/os'
'/images/initrd.img')
initrd_hash = 'a122057d95725ac030e2ec51df46e172'
initrd_path_xz = self.fetch_asset(initrd_url, algorithm='md5',
asset_hash=initrd_hash)
initrd_path = os.path.join(self.workdir, 'initrd-raw.img') initrd_path = os.path.join(self.workdir, 'initrd-raw.img')
archive.lzma_uncompress(initrd_path_xz, initrd_path) lzma_uncompress(initrd_path_xz, initrd_path)
self.vm.set_console() self.vm.set_console()
kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE kernel_command_line = self.KERNEL_COMMON_COMMAND_LINE
@ -115,10 +114,8 @@ class S390CPUTopology(QemuSystemTest):
def test_single(self): def test_single(self):
""" """
This test checks the simplest topology with a single CPU. This test checks the simplest topology with a single CPU.
:avocado: tags=arch:s390x
:avocado: tags=machine:s390-ccw-virtio
""" """
self.set_machine('s390-ccw-virtio')
self.kernel_init() self.kernel_init()
self.vm.launch() self.vm.launch()
self.wait_until_booted() self.wait_until_booted()
@ -127,10 +124,8 @@ class S390CPUTopology(QemuSystemTest):
def test_default(self): def test_default(self):
""" """
This test checks the implicit topology. This test checks the implicit topology.
:avocado: tags=arch:s390x
:avocado: tags=machine:s390-ccw-virtio
""" """
self.set_machine('s390-ccw-virtio')
self.kernel_init() self.kernel_init()
self.vm.add_args('-smp', self.vm.add_args('-smp',
'13,drawers=2,books=2,sockets=3,cores=2,maxcpus=24') '13,drawers=2,books=2,sockets=3,cores=2,maxcpus=24')
@ -154,10 +149,8 @@ class S390CPUTopology(QemuSystemTest):
""" """
This test checks the topology modification by moving a CPU This test checks the topology modification by moving a CPU
to another socket: CPU 0 is moved from socket 0 to socket 2. to another socket: CPU 0 is moved from socket 0 to socket 2.
:avocado: tags=arch:s390x
:avocado: tags=machine:s390-ccw-virtio
""" """
self.set_machine('s390-ccw-virtio')
self.kernel_init() self.kernel_init()
self.vm.add_args('-smp', self.vm.add_args('-smp',
'1,drawers=2,books=2,sockets=3,cores=2,maxcpus=24') '1,drawers=2,books=2,sockets=3,cores=2,maxcpus=24')
@ -174,10 +167,8 @@ class S390CPUTopology(QemuSystemTest):
""" """
This test verifies that a CPU defined with the '-device' This test verifies that a CPU defined with the '-device'
command line option finds its right place inside the topology. command line option finds its right place inside the topology.
:avocado: tags=arch:s390x
:avocado: tags=machine:s390-ccw-virtio
""" """
self.set_machine('s390-ccw-virtio')
self.kernel_init() self.kernel_init()
self.vm.add_args('-smp', self.vm.add_args('-smp',
'1,drawers=2,books=2,sockets=3,cores=2,maxcpus=24') '1,drawers=2,books=2,sockets=3,cores=2,maxcpus=24')
@ -221,10 +212,8 @@ class S390CPUTopology(QemuSystemTest):
""" """
This test verifies that QEMU modifies the entitlement change after This test verifies that QEMU modifies the entitlement change after
several guest polarization change requests. several guest polarization change requests.
:avocado: tags=arch:s390x
:avocado: tags=machine:s390-ccw-virtio
""" """
self.set_machine('s390-ccw-virtio')
self.kernel_init() self.kernel_init()
self.vm.launch() self.vm.launch()
self.wait_until_booted() self.wait_until_booted()
@ -267,10 +256,8 @@ class S390CPUTopology(QemuSystemTest):
""" """
This test verifies that QEMU modifies the entitlement This test verifies that QEMU modifies the entitlement
after a guest request and that the guest sees the change. after a guest request and that the guest sees the change.
:avocado: tags=arch:s390x
:avocado: tags=machine:s390-ccw-virtio
""" """
self.set_machine('s390-ccw-virtio')
self.kernel_init() self.kernel_init()
self.vm.launch() self.vm.launch()
self.wait_until_booted() self.wait_until_booted()
@ -313,10 +300,8 @@ class S390CPUTopology(QemuSystemTest):
CPU is made dedicated. CPU is made dedicated.
QEMU retains the entitlement value when horizontal polarization is in effect. QEMU retains the entitlement value when horizontal polarization is in effect.
For the guest, the field shows the effective value of the entitlement. For the guest, the field shows the effective value of the entitlement.
:avocado: tags=arch:s390x
:avocado: tags=machine:s390-ccw-virtio
""" """
self.set_machine('s390-ccw-virtio')
self.kernel_init() self.kernel_init()
self.vm.launch() self.vm.launch()
self.wait_until_booted() self.wait_until_booted()
@ -345,10 +330,8 @@ class S390CPUTopology(QemuSystemTest):
This test verifies that QEMU does not accept to overload a socket. This test verifies that QEMU does not accept to overload a socket.
The socket-id 0 on book-id 0 already contains CPUs 0 and 1 and can The socket-id 0 on book-id 0 already contains CPUs 0 and 1 and can
not accept any new CPU while socket-id 0 on book-id 1 is free. not accept any new CPU while socket-id 0 on book-id 1 is free.
:avocado: tags=arch:s390x
:avocado: tags=machine:s390-ccw-virtio
""" """
self.set_machine('s390-ccw-virtio')
self.kernel_init() self.kernel_init()
self.vm.add_args('-smp', self.vm.add_args('-smp',
'3,drawers=2,books=2,sockets=3,cores=2,maxcpus=24') '3,drawers=2,books=2,sockets=3,cores=2,maxcpus=24')
@ -369,10 +352,8 @@ class S390CPUTopology(QemuSystemTest):
""" """
This test verifies that QEMU refuses to lower the entitlement This test verifies that QEMU refuses to lower the entitlement
of a dedicated CPU of a dedicated CPU
:avocado: tags=arch:s390x
:avocado: tags=machine:s390-ccw-virtio
""" """
self.set_machine('s390-ccw-virtio')
self.kernel_init() self.kernel_init()
self.vm.launch() self.vm.launch()
self.wait_until_booted() self.wait_until_booted()
@ -417,10 +398,8 @@ class S390CPUTopology(QemuSystemTest):
""" """
This test verifies that QEMU refuses to move a CPU to an This test verifies that QEMU refuses to move a CPU to an
nonexistent location nonexistent location
:avocado: tags=arch:s390x
:avocado: tags=machine:s390-ccw-virtio
""" """
self.set_machine('s390-ccw-virtio')
self.kernel_init() self.kernel_init()
self.vm.launch() self.vm.launch()
self.wait_until_booted() self.wait_until_booted()
@ -437,3 +416,6 @@ class S390CPUTopology(QemuSystemTest):
self.assertEqual(res['error']['class'], 'GenericError') self.assertEqual(res['error']['class'], 'GenericError')
self.check_topology(0, 0, 0, 0, 'medium', False) self.check_topology(0, 0, 0, 0, 'medium', False)
if __name__ == '__main__':
QemuSystemTest.main()