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

Merge tag 'pull-request-2026-07-12' of https://gitlab.com/huth/qemu into staging

Browse Source 
* Fix functional tests to take aliased machine names into account again

# -----BEGIN PGP SIGNATURE-----
#
# iQJGBAABCAAwFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmpTcFISHHRoLmh1dGhA
# cG9zdGVvLmV1AAoJEC7Z13T+cC21I3cQAIVeNFL6k3GT9vAu9CoOhkmIdRcWYtc9
# vPTOg3RScP8CiuvUVAGkalzKYPdbjj5hYcViO1wHNaECNJRiYGGdiNYkRMdukLev
# P7jionoC7SEPV7UIRgSRwWiIPRYM39DPS7jTfUnhBTQ7tW8pHnzfAUdyd//E6Ml6
# EQInvcseggzTqOfcLya15JWwNC+/HNjaMNuUYOmtwW7PzZYVeSNEp96jPSqBnPvO
# n0u9QGu1BOJBKXc4NgRyUuM0iRszDQoMAj1HXHgNYtrSms7YM9lNjK3OKLHJ0p3R
# UHOi/jrUHf992g7Vb9uY5NTcqBFim+RBqvN3wvVqZ+cAdxLqToYFPQTsdzVXddVi
# Ie3fGTAtBNm/u4Bo8VYd3rPWElhlqelaJ+sm0QFQpCEJuWzYoKiVs1NB59xY8Vxu
# z/I3iytiMXMfvC5A+RJuPPGUVknAThQmnusvgWWeaeiOCjDmTdXucLxm9T8+liQV
# tCVdYQOD5UhbWMS9BEo3r3xJicP8lzRwbdJd4UbWFfpEpw/HqFNvlI8iqgK9MkV6
# d33irRvRPrTdQcJ2/IeVRDywusDp6VxOci8eaG7gyX+KJLzEYRdxbir4O3inK9+y
# VMScyzZjqKiqHytYUCp2uo3rkx8qCaqolQxkrHfvZIfjghaS7XA7v1HvYMiVs/8p
# +IWU1Xvl02ij
# =palu
# -----END PGP SIGNATURE-----
# gpg: Signature made Sun 12 Jul 2026 12:45:38 CEST
# gpg:                using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5
# gpg:                issuer "th.huth@posteo.eu"
# 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>" [full]
# gpg:                 aka "Thomas Huth <th.huth@posteo.eu>" [full]
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* tag 'pull-request-2026-07-12' of https://gitlab.com/huth/qemu:
  tests/functional: fix querying available machines

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi
2026-07-12 21:49:04 +02:00
parent a759542a2c 1531b9ec8c
commit 499039798c
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/functional/qemu_test/testcase.py
View File

@@ -325,9 +325,12 @@ def set_machine(self, machinename):
resp = tmp_vm.qmp('query-machines')
machines = resp.get('return', [])
cls._machines = [
m.get('name') for m in machines if 'name' in m
]
cls._machines = []
for m in machines:
if 'name' in m:
cls._machines.append(m['name'])
if 'alias' in m:
cls._machines.append(m['alias'])
finally:
try: