OSDN Git Service
(root)
/
qmiga
/
qemu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
python/machine: raise VMLaunchFailure exception from launch()
[qmiga/qemu.git]
/
tests
/
qemu-iotests
/
tests
/
mirror-top-perms
diff --git
a/tests/qemu-iotests/tests/mirror-top-perms
b/tests/qemu-iotests/tests/mirror-top-perms
index
0a51a61
..
b584997
100755
(executable)
--- a/
tests/qemu-iotests/tests/mirror-top-perms
+++ b/
tests/qemu-iotests/tests/mirror-top-perms
@@
-21,7
+21,6
@@
import os
import os
-from qemu.aqmp import ConnectError
from qemu.machine import machine
from qemu.qmp import QMPConnectError
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')
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',
assert 'Is another process using the image' in self.vm_b.get_log()
result = self.vm.qmp('block-job-cancel',