diff options
| author | Peter Maydell | 2022-02-03 16:42:28 +0100 |
|---|---|---|
| committer | Peter Maydell | 2022-02-03 16:42:28 +0100 |
| commit | 31f59af395922b7f40799e75db6e15ff52d8f94a (patch) | |
| tree | 3dad1f53308b49c39d898334ff59d3cea58d3855 /tests | |
| parent | Merge remote-tracking branch 'remotes/hdeller/tags/hppa-updates-pull-request'... (diff) | |
| parent | python/aqmp: add socket bind step to legacy.py (diff) | |
| download | qemu-31f59af395922b7f40799e75db6e15ff52d8f94a.tar.gz qemu-31f59af395922b7f40799e75db6e15ff52d8f94a.tar.xz qemu-31f59af395922b7f40799e75db6e15ff52d8f94a.zip | |
Merge remote-tracking branch 'remotes/jsnow-gitlab/tags/python-pull-request' into staging
Python patches
Peter: I expect this to address the iotest 040,041 failures you observed
on NetBSD. If it doesn't, let me know.
# gpg: Signature made Thu 03 Feb 2022 01:59:32 GMT
# gpg: using RSA key F9B7ABDBBCACDF95BE76CBD07DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>" [full]
# Primary key fingerprint: FAEB 9711 A12C F475 812F 18F2 88A9 064D 1835 61EB
# Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76 CBD0 7DEF 8106 AAFC 390E
* remotes/jsnow-gitlab/tags/python-pull-request:
python/aqmp: add socket bind step to legacy.py
python: upgrade mypy to 0.780
python/machine: raise VMLaunchFailure exception from launch()
python/aqmp: Fix negotiation with pre-"oob" QEMU
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/qemu-iotests/tests/mirror-top-perms | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/qemu-iotests/tests/mirror-top-perms b/tests/qemu-iotests/tests/mirror-top-perms index 0a51a613f3..b5849978c4 100755 --- a/tests/qemu-iotests/tests/mirror-top-perms +++ b/tests/qemu-iotests/tests/mirror-top-perms @@ -21,7 +21,6 @@ import os -from qemu.aqmp import ConnectError from qemu.machine import machine from qemu.qmp import QMPConnectError @@ -107,7 +106,7 @@ class TestMirrorTopPerms(iotests.QMPTestCase): self.vm_b.launch() print('ERROR: VM B launched successfully, ' 'this should not have happened') - except (QMPConnectError, ConnectError): + except (QMPConnectError, machine.VMLaunchFailure): assert 'Is another process using the image' in self.vm_b.get_log() result = self.vm.qmp('block-job-cancel', |