Technically AbnormalShutdown isn't exported via 'qemu.machine.AbnormalShutdown', but instead from 'qemu.machine.machine.AbnormalShutdown'. Odd, I know, and it's on the list to fix. For now, change the imports here.
Signed-off-by: John Snow <[email protected]> --- tests/qemu-iotests/tests/mirror-top-perms | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/qemu-iotests/tests/mirror-top-perms b/tests/qemu-iotests/tests/mirror-top-perms index 451a0666f81..de181825901 100755 --- a/tests/qemu-iotests/tests/mirror-top-perms +++ b/tests/qemu-iotests/tests/mirror-top-perms @@ -25,7 +25,8 @@ from iotests import qemu_img # Import qemu after iotests.py has amended sys.path # pylint: disable=wrong-import-order -import qemu +from qemu import qmp +from qemu.machine import machine image_size = 1 * 1024 * 1024 @@ -47,7 +48,7 @@ class TestMirrorTopPerms(iotests.QMPTestCase): def tearDown(self): try: self.vm.shutdown() - except qemu.machine.AbnormalShutdown: + except machine.AbnormalShutdown: pass if self.vm_b is not None: @@ -102,7 +103,7 @@ class TestMirrorTopPerms(iotests.QMPTestCase): self.vm_b.launch() print('ERROR: VM B launched successfully, this should not have ' 'happened') - except qemu.qmp.QMPConnectError: + except qmp.QMPConnectError: assert 'Is another process using the image' in self.vm_b.get_log() result = self.vm.qmp('block-job-cancel', -- 2.31.1
