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

* Fix the avocado tests for running with Python 3.12

Browse Source 
* Add some asset hashes to silence warnings
 * Fix the broken reverse_debugging test
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmVWWRARHHRodXRoQHJl
 ZGhhdC5jb20ACgkQLtnXdP5wLbWOnQ/8DdnPGlXrOl+4QzRaJQovmmS04OZuiWtB
 TpOd/cWQMsKKX7YGq9uAuLBa7zYXyHZLmOLcSYYKYzcFnxX155TgtXDqZXJb7k8D
 9rGtF8vgGokT3VmsWW6w5LNa1Pg5FPd56+l8Kus7iqpHbxPzMybP/HFGcuCdeMW9
 kFaLCvtP7LAPM9k8z6Nw9vbQ5aUx2J9fwSgWhoMYmVO72A7HUZ0KA+lti/3xvhKy
 zcYJ4PxFaSK4SQwG8yfhmwqCw3QjeH+Se8gxvqR6nmKW9wCA3FdmUFaQPQQF6bq+
 AEUPBJpa+eZA38tA9rts6VSVGgrg5IA9rPYFc8ZIYn6dMgkAqR7snvcphyUAijJ9
 oqS72BJkw6KZ+52QyZ4O2zG4lkgi/uHp0qhmAr/FHDLkmetTjyQ4vA5dm76V5B2G
 EAPzNZct0RluD0hk2qIKXRC4FN4HFaEAL4EpDjCuymTArsEhSf9I8IEMu9V4CVHs
 Jp2c/0EZNCcTeqc7xr+lO+JFMd1kbB2N9yApFrbQpaIsZQkSF/oNtFZ8h8n/DhNJ
 Ojp9hSUkb37eBZuRA5wsDAo9WI1ADV1n7Ku7ao9aJ84iozcAvOjk2T+NXkeKJEdW
 br8RCqpm0yiB9W7X9WUa5uQd69pdKX4ILW1ekdrG02CuxbIE42Jx5WYdzUrXDUIz
 hzD/QPF3TsI=
 =IcSd
 -----END PGP SIGNATURE-----

Merge tag 'pull-request-2023-11-16' of https://gitlab.com/thuth/qemu into staging

* Fix the avocado tests for running with Python 3.12
* Add some asset hashes to silence warnings
* Fix the broken reverse_debugging test

# -----BEGIN PGP SIGNATURE-----
#
# iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmVWWRARHHRodXRoQHJl
# ZGhhdC5jb20ACgkQLtnXdP5wLbWOnQ/8DdnPGlXrOl+4QzRaJQovmmS04OZuiWtB
# TpOd/cWQMsKKX7YGq9uAuLBa7zYXyHZLmOLcSYYKYzcFnxX155TgtXDqZXJb7k8D
# 9rGtF8vgGokT3VmsWW6w5LNa1Pg5FPd56+l8Kus7iqpHbxPzMybP/HFGcuCdeMW9
# kFaLCvtP7LAPM9k8z6Nw9vbQ5aUx2J9fwSgWhoMYmVO72A7HUZ0KA+lti/3xvhKy
# zcYJ4PxFaSK4SQwG8yfhmwqCw3QjeH+Se8gxvqR6nmKW9wCA3FdmUFaQPQQF6bq+
# AEUPBJpa+eZA38tA9rts6VSVGgrg5IA9rPYFc8ZIYn6dMgkAqR7snvcphyUAijJ9
# oqS72BJkw6KZ+52QyZ4O2zG4lkgi/uHp0qhmAr/FHDLkmetTjyQ4vA5dm76V5B2G
# EAPzNZct0RluD0hk2qIKXRC4FN4HFaEAL4EpDjCuymTArsEhSf9I8IEMu9V4CVHs
# Jp2c/0EZNCcTeqc7xr+lO+JFMd1kbB2N9yApFrbQpaIsZQkSF/oNtFZ8h8n/DhNJ
# Ojp9hSUkb37eBZuRA5wsDAo9WI1ADV1n7Ku7ao9aJ84iozcAvOjk2T+NXkeKJEdW
# br8RCqpm0yiB9W7X9WUa5uQd69pdKX4ILW1ekdrG02CuxbIE42Jx5WYdzUrXDUIz
# hzD/QPF3TsI=
# =IcSd
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu 16 Nov 2023 13:01:52 EST
# gpg:                using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg:                issuer "thuth@redhat.com"
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full]
# gpg:                 aka "Thomas Huth <thuth@redhat.com>" [full]
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>" [full]
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>" [unknown]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* tag 'pull-request-2023-11-16' of https://gitlab.com/thuth/qemu:
  tests/avocado: Enable reverse_debugging.py tests in gitlab CI
  tests/avocado: reverse_debugging drain console to prevent hang
  tests/avocado/mem-addr-space-check: Replace assertEquals() for Python 3.12
  tests/avocado/replay_kernel: Mark the test_x86_64_pc as flaky
  tests/avocado: Make fetch_asset() unconditionally require a crypto hash
  tests/avocado/multiprocess: Add asset hashes to silence warnings
  tests/avocado/intel_iommu: Add asset hashes to avoid warnings
  tests/avocado/virtio-gpu: Fix test_vhost_user_vga_virgl for edid support
  tests/avocado: Replace assertRegexpMatches() for Python 3.12 compatibility
  tests/avocado: Replace assertEquals() for Python 3.12 compatibility

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2023-11-20 05:23:30 -05:00
commit d86f3f5faa
13 changed files with 88 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/devel/testing.rst
View File

@ -1016,7 +1016,7 @@ class. Here's a simple usage example:
self.vm.launch() self.vm.launch()
res = self.vm.cmd('human-monitor-command', res = self.vm.cmd('human-monitor-command',
command_line='info version') command_line='info version')
self.assertRegexpMatches(res, r'^(\d+\.\d+\.\d)') self.assertRegex(res, r'^(\d+\.\d+\.\d)')
To execute your test, run: To execute your test, run:
@ -1077,7 +1077,7 @@ and hypothetical example follows:
'human-monitor-command', 'human-monitor-command',
command_line='info version') command_line='info version')
self.assertEquals(first_res, second_res, third_res) self.assertEqual(first_res, second_res, third_res)
At test "tear down", ``avocado_qemu.Test`` handles all the QEMUMachines At test "tear down", ``avocado_qemu.Test`` handles all the QEMUMachines
shutdown. shutdown.

2
tests/avocado/avocado_qemu/__init__.py
View File

@ -254,7 +254,7 @@ class QemuBaseTest(avocado.Test):
self.cancel("No QEMU binary defined or found in the build tree") self.cancel("No QEMU binary defined or found in the build tree")
def fetch_asset(self, name, def fetch_asset(self, name,
asset_hash=None, algorithm=None, asset_hash, algorithm=None,
locations=None, expire=None, locations=None, expire=None,
find_only=False, cancel_on_missing=True): find_only=False, cancel_on_missing=True):
return super().fetch_asset(name, return super().fetch_asset(name,

2
tests/avocado/cpu_queries.py
View File

@ -32,4 +32,4 @@ class QueryCPUModelExpansion(QemuSystemTest):
model = {'name': c['name']} model = {'name': c['name']}
e = self.vm.cmd('query-cpu-model-expansion', model=model, e = self.vm.cmd('query-cpu-model-expansion', model=model,
type='full') type='full')
self.assertEquals(e['model']['name'], c['name']) self.assertEqual(e['model']['name'], c['name'])

2
tests/avocado/empty_cpu_model.py
View File

@ -15,5 +15,5 @@ class EmptyCPUModel(QemuSystemTest):
self.vm.set_qmp_monitor(enabled=False) self.vm.set_qmp_monitor(enabled=False)
self.vm.launch() self.vm.launch()
self.vm.wait() self.vm.wait()
self.assertEquals(self.vm.exitcode(), 1, "QEMU exit code should be 1") self.assertEqual(self.vm.exitcode(), 1, "QEMU exit code should be 1")
self.assertRegex(self.vm.get_log(), r'-cpu option cannot be empty') self.assertRegex(self.vm.get_log(), r'-cpu option cannot be empty')

6
tests/avocado/intel_iommu.py
View File

@ -54,9 +54,11 @@ class IntelIOMMU(LinuxTest):
return return
kernel_url = self.distro.pxeboot_url + 'vmlinuz' kernel_url = self.distro.pxeboot_url + 'vmlinuz'
kernel_hash = '5b6f6876e1b5bda314f93893271da0d5777b1f3c'
initrd_url = self.distro.pxeboot_url + 'initrd.img' initrd_url = self.distro.pxeboot_url + 'initrd.img'
self.kernel_path = self.fetch_asset(kernel_url) initrd_hash = 'dd0340a1b39bd28f88532babd4581c67649ec5b1'
self.initrd_path = self.fetch_asset(initrd_url) self.kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
self.initrd_path = self.fetch_asset(initrd_url, asset_hash=initrd_hash)
def run_and_check(self): def run_and_check(self):
if self.kernel_path: if self.kernel_path:

14
tests/avocado/mem-addr-space-check.py
View File

@ -49,7 +49,7 @@ class MemAddrCheck(QemuSystemTest):
self.vm.set_qmp_monitor(enabled=False) self.vm.set_qmp_monitor(enabled=False)
self.vm.launch() self.vm.launch()
self.vm.wait() self.vm.wait()
self.assertEquals(self.vm.exitcode(), 1, "QEMU exit code should be 1") self.assertEqual(self.vm.exitcode(), 1, "QEMU exit code should be 1")
self.assertRegex(self.vm.get_log(), r'phys-bits too low') self.assertRegex(self.vm.get_log(), r'phys-bits too low')
def test_phybits_low_pae(self): def test_phybits_low_pae(self):
@ -69,7 +69,7 @@ class MemAddrCheck(QemuSystemTest):
self.vm.set_qmp_monitor(enabled=False) self.vm.set_qmp_monitor(enabled=False)
self.vm.launch() self.vm.launch()
self.vm.wait() self.vm.wait()
self.assertEquals(self.vm.exitcode(), 1, "QEMU exit code should be 1") self.assertEqual(self.vm.exitcode(), 1, "QEMU exit code should be 1")
self.assertRegex(self.vm.get_log(), r'phys-bits too low') self.assertRegex(self.vm.get_log(), r'phys-bits too low')
def test_phybits_ok_pentium_pse36(self): def test_phybits_ok_pentium_pse36(self):
@ -149,7 +149,7 @@ class MemAddrCheck(QemuSystemTest):
self.vm.set_qmp_monitor(enabled=False) self.vm.set_qmp_monitor(enabled=False)
self.vm.launch() self.vm.launch()
self.vm.wait() self.vm.wait()
self.assertEquals(self.vm.exitcode(), 1, "QEMU exit code should be 1") self.assertEqual(self.vm.exitcode(), 1, "QEMU exit code should be 1")
self.assertRegex(self.vm.get_log(), r'phys-bits too low') self.assertRegex(self.vm.get_log(), r'phys-bits too low')
# now lets test some 64-bit CPU cases. # now lets test some 64-bit CPU cases.
@ -179,7 +179,7 @@ class MemAddrCheck(QemuSystemTest):
self.vm.set_qmp_monitor(enabled=False) self.vm.set_qmp_monitor(enabled=False)
self.vm.launch() self.vm.launch()
self.vm.wait() self.vm.wait()
self.assertEquals(self.vm.exitcode(), 1, "QEMU exit code should be 1") self.assertEqual(self.vm.exitcode(), 1, "QEMU exit code should be 1")
self.assertRegex(self.vm.get_log(), r'phys-bits too low') self.assertRegex(self.vm.get_log(), r'phys-bits too low')
def test_phybits_low_tcg_q35_71_amd(self): def test_phybits_low_tcg_q35_71_amd(self):
@ -202,7 +202,7 @@ class MemAddrCheck(QemuSystemTest):
self.vm.set_qmp_monitor(enabled=False) self.vm.set_qmp_monitor(enabled=False)
self.vm.launch() self.vm.launch()
self.vm.wait() self.vm.wait()
self.assertEquals(self.vm.exitcode(), 1, "QEMU exit code should be 1") self.assertEqual(self.vm.exitcode(), 1, "QEMU exit code should be 1")
self.assertRegex(self.vm.get_log(), r'phys-bits too low') self.assertRegex(self.vm.get_log(), r'phys-bits too low')
def test_phybits_ok_tcg_q35_70_amd(self): def test_phybits_ok_tcg_q35_70_amd(self):
@ -288,7 +288,7 @@ class MemAddrCheck(QemuSystemTest):
self.vm.set_qmp_monitor(enabled=False) self.vm.set_qmp_monitor(enabled=False)
self.vm.launch() self.vm.launch()
self.vm.wait() self.vm.wait()
self.assertEquals(self.vm.exitcode(), 1, "QEMU exit code should be 1") self.assertEqual(self.vm.exitcode(), 1, "QEMU exit code should be 1")
self.assertRegex(self.vm.get_log(), r'phys-bits too low') self.assertRegex(self.vm.get_log(), r'phys-bits too low')
def test_phybits_ok_tcg_q35_71_amd_41bits(self): def test_phybits_ok_tcg_q35_71_amd_41bits(self):
@ -332,7 +332,7 @@ class MemAddrCheck(QemuSystemTest):
self.vm.set_qmp_monitor(enabled=False) self.vm.set_qmp_monitor(enabled=False)
self.vm.launch() self.vm.launch()
self.vm.wait() self.vm.wait()
self.assertEquals(self.vm.exitcode(), 1, "QEMU exit code should be 1") self.assertEqual(self.vm.exitcode(), 1, "QEMU exit code should be 1")
self.assertRegex(self.vm.get_log(), r'phys-bits too low') self.assertRegex(self.vm.get_log(), r'phys-bits too low')
def test_phybits_ok_tcg_q35_intel_cxl(self): def test_phybits_ok_tcg_q35_intel_cxl(self):

18
tests/avocado/multiprocess.py
View File

@ -18,8 +18,8 @@ class Multiprocess(QemuSystemTest):
""" """
KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 ' KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
def do_test(self, kernel_url, initrd_url, kernel_command_line, def do_test(self, kernel_url, kernel_hash, initrd_url, initrd_hash,
machine_type): kernel_command_line, machine_type):
"""Main test method""" """Main test method"""
self.require_accelerator('kvm') self.require_accelerator('kvm')
self.require_multiprocess() self.require_multiprocess()
@ -30,8 +30,8 @@ class Multiprocess(QemuSystemTest):
os.set_inheritable(proxy_sock.fileno(), True) os.set_inheritable(proxy_sock.fileno(), True)
os.set_inheritable(remote_sock.fileno(), True) os.set_inheritable(remote_sock.fileno(), True)
kernel_path = self.fetch_asset(kernel_url) kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
initrd_path = self.fetch_asset(initrd_url) initrd_path = self.fetch_asset(initrd_url, asset_hash=initrd_hash)
# Create remote process # Create remote process
remote_vm = self.get_vm() remote_vm = self.get_vm()
@ -72,13 +72,16 @@ class Multiprocess(QemuSystemTest):
kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora' kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora'
'/linux/releases/31/Everything/x86_64/os/images' '/linux/releases/31/Everything/x86_64/os/images'
'/pxeboot/vmlinuz') '/pxeboot/vmlinuz')
kernel_hash = '5b6f6876e1b5bda314f93893271da0d5777b1f3c'
initrd_url = ('https://archives.fedoraproject.org/pub/archive/fedora' initrd_url = ('https://archives.fedoraproject.org/pub/archive/fedora'
'/linux/releases/31/Everything/x86_64/os/images' '/linux/releases/31/Everything/x86_64/os/images'
'/pxeboot/initrd.img') '/pxeboot/initrd.img')
initrd_hash = 'dd0340a1b39bd28f88532babd4581c67649ec5b1'
kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
'console=ttyS0 rdinit=/bin/bash') 'console=ttyS0 rdinit=/bin/bash')
machine_type = 'pc' machine_type = 'pc'
self.do_test(kernel_url, initrd_url, kernel_command_line, machine_type) self.do_test(kernel_url, kernel_hash, initrd_url, initrd_hash,
kernel_command_line, machine_type)
def test_multiprocess_aarch64(self): def test_multiprocess_aarch64(self):
""" """
@ -87,10 +90,13 @@ class Multiprocess(QemuSystemTest):
kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora' kernel_url = ('https://archives.fedoraproject.org/pub/archive/fedora'
'/linux/releases/31/Everything/aarch64/os/images' '/linux/releases/31/Everything/aarch64/os/images'
'/pxeboot/vmlinuz') '/pxeboot/vmlinuz')
kernel_hash = '3505f2751e2833c681de78cee8dda1e49cabd2e8'
initrd_url = ('https://archives.fedoraproject.org/pub/archive/fedora' initrd_url = ('https://archives.fedoraproject.org/pub/archive/fedora'
'/linux/releases/31/Everything/aarch64/os/images' '/linux/releases/31/Everything/aarch64/os/images'
'/pxeboot/initrd.img') '/pxeboot/initrd.img')
initrd_hash = '519a1962daf17d67fc3a9c89d45affcb399607db'
kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
'rdinit=/bin/bash console=ttyAMA0') 'rdinit=/bin/bash console=ttyAMA0')
machine_type = 'virt,gic-version=3' machine_type = 'virt,gic-version=3'
self.do_test(kernel_url, initrd_url, kernel_command_line, machine_type) self.do_test(kernel_url, kernel_hash, initrd_url, initrd_hash,
kernel_command_line, machine_type)

2
tests/avocado/pc_cpu_hotplug_props.py
View File

@ -32,4 +32,4 @@ class OmittedCPUProps(QemuSystemTest):
self.vm.add_args('-smp', '1,sockets=2,cores=2,threads=2,maxcpus=8') self.vm.add_args('-smp', '1,sockets=2,cores=2,threads=2,maxcpus=8')
self.vm.add_args('-device', 'qemu64-x86_64-cpu,socket-id=1,core-id=0,thread-id=0') self.vm.add_args('-device', 'qemu64-x86_64-cpu,socket-id=1,core-id=0,thread-id=0')
self.vm.launch() self.vm.launch()
self.assertEquals(len(self.vm.cmd('query-cpus-fast')), 2) self.assertEqual(len(self.vm.cmd('query-cpus-fast')), 2)

3
tests/avocado/replay_kernel.py
View File

@ -81,7 +81,8 @@ class ReplayKernelBase(LinuxKernelTest):
logger.info('replay overhead {:.2%}'.format(t2 / t1 - 1)) logger.info('replay overhead {:.2%}'.format(t2 / t1 - 1))
class ReplayKernelNormal(ReplayKernelBase): class ReplayKernelNormal(ReplayKernelBase):
@skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab')
@skipUnless(os.getenv('QEMU_TEST_FLAKY_TESTS'), 'Test sometimes gets stuck')
def test_x86_64_pc(self): def test_x86_64_pc(self):
""" """
:avocado: tags=arch:x86_64 :avocado: tags=arch:x86_64

12
tests/avocado/reverse_debugging.py
View File

@ -12,6 +12,7 @@ import logging
from avocado import skipIf from avocado import skipIf
from avocado_qemu import BUILD_DIR from avocado_qemu import BUILD_DIR
from avocado.utils import datadrainer
from avocado.utils import gdb from avocado.utils import gdb
from avocado.utils import process from avocado.utils import process
from avocado.utils.network.ports import find_free_port from avocado.utils.network.ports import find_free_port
@ -52,6 +53,10 @@ class ReverseDebugging(LinuxKernelTest):
if args: if args:
vm.add_args(*args) vm.add_args(*args)
vm.launch() vm.launch()
console_drainer = datadrainer.LineLogger(vm.console_socket.fileno(),
logger=self.log.getChild('console'),
stop_check=(lambda : not vm.is_running()))
console_drainer.start()
return vm return vm
@staticmethod @staticmethod
@ -200,8 +205,6 @@ class ReverseDebugging_X86_64(ReverseDebugging):
return self.get_reg_le(g, self.REG_PC) \ return self.get_reg_le(g, self.REG_PC) \
+ self.get_reg_le(g, self.REG_CS) * 0x10 + self.get_reg_le(g, self.REG_CS) * 0x10
# unidentified gitlab timeout problem
@skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab')
def test_x86_64_pc(self): def test_x86_64_pc(self):
""" """
:avocado: tags=arch:x86_64 :avocado: tags=arch:x86_64
@ -217,8 +220,6 @@ class ReverseDebugging_AArch64(ReverseDebugging):
REG_PC = 32 REG_PC = 32
# unidentified gitlab timeout problem
@skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab')
def test_aarch64_virt(self): def test_aarch64_virt(self):
""" """
:avocado: tags=arch:aarch64 :avocado: tags=arch:aarch64
@ -241,8 +242,6 @@ class ReverseDebugging_ppc64(ReverseDebugging):
REG_PC = 0x40 REG_PC = 0x40
# unidentified gitlab timeout problem
@skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab')
def test_ppc64_pseries(self): def test_ppc64_pseries(self):
""" """
:avocado: tags=arch:ppc64 :avocado: tags=arch:ppc64
@ -254,7 +253,6 @@ class ReverseDebugging_ppc64(ReverseDebugging):
self.endian_is_le = False self.endian_is_le = False
self.reverse_debugging() self.reverse_debugging()
@skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab')
def test_ppc64_powernv(self): def test_ppc64_powernv(self):
""" """
:avocado: tags=arch:ppc64 :avocado: tags=arch:ppc64

2
tests/avocado/version.py
View File

@ -22,4 +22,4 @@ class Version(QemuSystemTest):
self.vm.launch() self.vm.launch()
res = self.vm.cmd('human-monitor-command', res = self.vm.cmd('human-monitor-command',
command_line='info version') command_line='info version')
self.assertRegexpMatches(res, r'^(\d+\.\d+\.\d)') self.assertRegex(res, r'^(\d+\.\d+\.\d)')

6
tests/avocado/virtio-gpu.py
View File

@ -149,10 +149,8 @@ class VirtioGPUx86(QemuSystemTest):
# TODO: probably fails because we are missing the VirGL features # TODO: probably fails because we are missing the VirGL features
self.cancel("VirGL not enabled?") self.cancel("VirGL not enabled?")
self.wait_for_console_pattern("as init process") self.wait_for_console_pattern("as init process")
exec_command_and_wait_for_pattern( exec_command_and_wait_for_pattern(self, "/usr/sbin/modprobe virtio_gpu",
self, "/usr/sbin/modprobe virtio_gpu", "" "features: +virgl +edid")
)
self.wait_for_console_pattern("features: +virgl -edid")
self.vm.shutdown() self.vm.shutdown()
qemu_sock.close() qemu_sock.close()
vugp.terminate() vugp.terminate()

97
tests/avocado/x86_cpu_model_versions.py
View File

@ -121,94 +121,95 @@ class X86CPUModelAliases(avocado_qemu.QemuSystemTest):
self.assertFalse(cpus['Cascadelake-Server']['static'], self.assertFalse(cpus['Cascadelake-Server']['static'],
'unversioned Cascadelake-Server CPU model must not be static') 'unversioned Cascadelake-Server CPU model must not be static')
self.assertEquals(cpus['Cascadelake-Server'].get('alias-of'), 'Cascadelake-Server-v1', self.assertEqual(cpus['Cascadelake-Server'].get('alias-of'),
'Cascadelake-Server must be an alias of Cascadelake-Server-v1') 'Cascadelake-Server-v1',
'Cascadelake-Server must be an alias of Cascadelake-Server-v1')
self.assertNotIn('alias-of', cpus['Cascadelake-Server-v1'], self.assertNotIn('alias-of', cpus['Cascadelake-Server-v1'],
'Cascadelake-Server-v1 must not be an alias') 'Cascadelake-Server-v1 must not be an alias')
self.assertFalse(cpus['qemu64']['static'], self.assertFalse(cpus['qemu64']['static'],
'unversioned qemu64 CPU model must not be static') 'unversioned qemu64 CPU model must not be static')
self.assertEquals(cpus['qemu64'].get('alias-of'), 'qemu64-v1', self.assertEqual(cpus['qemu64'].get('alias-of'), 'qemu64-v1',
'qemu64 must be an alias of qemu64-v1') 'qemu64 must be an alias of qemu64-v1')
self.assertNotIn('alias-of', cpus['qemu64-v1'], self.assertNotIn('alias-of', cpus['qemu64-v1'],
'qemu64-v1 must not be an alias') 'qemu64-v1 must not be an alias')
self.validate_variant_aliases(cpus) self.validate_variant_aliases(cpus)
# On pc-*-4.1, -noTSX and -IBRS models should be aliases: # On pc-*-4.1, -noTSX and -IBRS models should be aliases:
self.assertEquals(cpus["Haswell"].get('alias-of'), self.assertEqual(cpus["Haswell"].get('alias-of'),
"Haswell-v1", "Haswell-v1",
"Haswell must be an alias") "Haswell must be an alias")
self.assertEquals(cpus["Haswell-noTSX"].get('alias-of'), self.assertEqual(cpus["Haswell-noTSX"].get('alias-of'),
"Haswell-v2", "Haswell-v2",
"Haswell-noTSX must be an alias") "Haswell-noTSX must be an alias")
self.assertEquals(cpus["Haswell-IBRS"].get('alias-of'), self.assertEqual(cpus["Haswell-IBRS"].get('alias-of'),
"Haswell-v3", "Haswell-v3",
"Haswell-IBRS must be an alias") "Haswell-IBRS must be an alias")
self.assertEquals(cpus["Haswell-noTSX-IBRS"].get('alias-of'), self.assertEqual(cpus["Haswell-noTSX-IBRS"].get('alias-of'),
"Haswell-v4", "Haswell-v4",
"Haswell-noTSX-IBRS must be an alias") "Haswell-noTSX-IBRS must be an alias")
self.assertEquals(cpus["Broadwell"].get('alias-of'), self.assertEqual(cpus["Broadwell"].get('alias-of'),
"Broadwell-v1", "Broadwell-v1",
"Broadwell must be an alias") "Broadwell must be an alias")
self.assertEquals(cpus["Broadwell-noTSX"].get('alias-of'), self.assertEqual(cpus["Broadwell-noTSX"].get('alias-of'),
"Broadwell-v2", "Broadwell-v2",
"Broadwell-noTSX must be an alias") "Broadwell-noTSX must be an alias")
self.assertEquals(cpus["Broadwell-IBRS"].get('alias-of'), self.assertEqual(cpus["Broadwell-IBRS"].get('alias-of'),
"Broadwell-v3", "Broadwell-v3",
"Broadwell-IBRS must be an alias") "Broadwell-IBRS must be an alias")
self.assertEquals(cpus["Broadwell-noTSX-IBRS"].get('alias-of'), self.assertEqual(cpus["Broadwell-noTSX-IBRS"].get('alias-of'),
"Broadwell-v4", "Broadwell-v4",
"Broadwell-noTSX-IBRS must be an alias") "Broadwell-noTSX-IBRS must be an alias")
self.assertEquals(cpus["Nehalem"].get('alias-of'), self.assertEqual(cpus["Nehalem"].get('alias-of'),
"Nehalem-v1", "Nehalem-v1",
"Nehalem must be an alias") "Nehalem must be an alias")
self.assertEquals(cpus["Nehalem-IBRS"].get('alias-of'), self.assertEqual(cpus["Nehalem-IBRS"].get('alias-of'),
"Nehalem-v2", "Nehalem-v2",
"Nehalem-IBRS must be an alias") "Nehalem-IBRS must be an alias")
self.assertEquals(cpus["Westmere"].get('alias-of'), self.assertEqual(cpus["Westmere"].get('alias-of'),
"Westmere-v1", "Westmere-v1",
"Westmere must be an alias") "Westmere must be an alias")
self.assertEquals(cpus["Westmere-IBRS"].get('alias-of'), self.assertEqual(cpus["Westmere-IBRS"].get('alias-of'),
"Westmere-v2", "Westmere-v2",
"Westmere-IBRS must be an alias") "Westmere-IBRS must be an alias")
self.assertEquals(cpus["SandyBridge"].get('alias-of'), self.assertEqual(cpus["SandyBridge"].get('alias-of'),
"SandyBridge-v1", "SandyBridge-v1",
"SandyBridge must be an alias") "SandyBridge must be an alias")
self.assertEquals(cpus["SandyBridge-IBRS"].get('alias-of'), self.assertEqual(cpus["SandyBridge-IBRS"].get('alias-of'),
"SandyBridge-v2", "SandyBridge-v2",
"SandyBridge-IBRS must be an alias") "SandyBridge-IBRS must be an alias")
self.assertEquals(cpus["IvyBridge"].get('alias-of'), self.assertEqual(cpus["IvyBridge"].get('alias-of'),
"IvyBridge-v1", "IvyBridge-v1",
"IvyBridge must be an alias") "IvyBridge must be an alias")
self.assertEquals(cpus["IvyBridge-IBRS"].get('alias-of'), self.assertEqual(cpus["IvyBridge-IBRS"].get('alias-of'),
"IvyBridge-v2", "IvyBridge-v2",
"IvyBridge-IBRS must be an alias") "IvyBridge-IBRS must be an alias")
self.assertEquals(cpus["Skylake-Client"].get('alias-of'), self.assertEqual(cpus["Skylake-Client"].get('alias-of'),
"Skylake-Client-v1", "Skylake-Client-v1",
"Skylake-Client must be an alias") "Skylake-Client must be an alias")
self.assertEquals(cpus["Skylake-Client-IBRS"].get('alias-of'), self.assertEqual(cpus["Skylake-Client-IBRS"].get('alias-of'),
"Skylake-Client-v2", "Skylake-Client-v2",
"Skylake-Client-IBRS must be an alias") "Skylake-Client-IBRS must be an alias")
self.assertEquals(cpus["Skylake-Server"].get('alias-of'), self.assertEqual(cpus["Skylake-Server"].get('alias-of'),
"Skylake-Server-v1", "Skylake-Server-v1",
"Skylake-Server must be an alias") "Skylake-Server must be an alias")
self.assertEquals(cpus["Skylake-Server-IBRS"].get('alias-of'), self.assertEqual(cpus["Skylake-Server-IBRS"].get('alias-of'),
"Skylake-Server-v2", "Skylake-Server-v2",
"Skylake-Server-IBRS must be an alias") "Skylake-Server-IBRS must be an alias")
self.assertEquals(cpus["EPYC"].get('alias-of'), self.assertEqual(cpus["EPYC"].get('alias-of'),
"EPYC-v1", "EPYC-v1",
"EPYC must be an alias") "EPYC must be an alias")
self.assertEquals(cpus["EPYC-IBPB"].get('alias-of'), self.assertEqual(cpus["EPYC-IBPB"].get('alias-of'),
"EPYC-v2", "EPYC-v2",
"EPYC-IBPB must be an alias") "EPYC-IBPB must be an alias")
self.validate_aliases(cpus) self.validate_aliases(cpus)