qemu-iotests: Drop local version of cancel_and_wait from 040
iotests.py already has one. Signed-off-by: Fam Zheng <famz@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
parent
b3af018f3b
commit
5b43dbb699
|
@ -39,21 +39,6 @@ class ImageCommitTestCase(iotests.QMPTestCase):
|
||||||
result = self.vm.qmp('query-block-jobs')
|
result = self.vm.qmp('query-block-jobs')
|
||||||
self.assert_qmp(result, 'return', [])
|
self.assert_qmp(result, 'return', [])
|
||||||
|
|
||||||
def cancel_and_wait(self, drive='drive0'):
|
|
||||||
'''Cancel a block job and wait for it to finish'''
|
|
||||||
result = self.vm.qmp('block-job-cancel', device=drive)
|
|
||||||
self.assert_qmp(result, 'return', {})
|
|
||||||
|
|
||||||
cancelled = False
|
|
||||||
while not cancelled:
|
|
||||||
for event in self.vm.get_qmp_events(wait=True):
|
|
||||||
if event['event'] == 'BLOCK_JOB_CANCELLED':
|
|
||||||
self.assert_qmp(event, 'data/type', 'commit')
|
|
||||||
self.assert_qmp(event, 'data/device', drive)
|
|
||||||
cancelled = True
|
|
||||||
|
|
||||||
self.assert_no_active_commit()
|
|
||||||
|
|
||||||
class TestSingleDrive(ImageCommitTestCase):
|
class TestSingleDrive(ImageCommitTestCase):
|
||||||
image_len = 1 * 1024 * 1024
|
image_len = 1 * 1024 * 1024
|
||||||
test_len = 1 * 1024 * 256
|
test_len = 1 * 1024 * 256
|
||||||
|
|
Loading…
Reference in a new issue