From 5b43dbb699599cdb9f75a624cb28d4f709ad2cdf Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Wed, 20 Nov 2013 10:01:53 +0800 Subject: [PATCH] qemu-iotests: Drop local version of cancel_and_wait from 040 iotests.py already has one. Signed-off-by: Fam Zheng Signed-off-by: Stefan Hajnoczi --- tests/qemu-iotests/040 | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/tests/qemu-iotests/040 b/tests/qemu-iotests/040 index a2e18c56d4..0e85136ae6 100755 --- a/tests/qemu-iotests/040 +++ b/tests/qemu-iotests/040 @@ -39,21 +39,6 @@ class ImageCommitTestCase(iotests.QMPTestCase): result = self.vm.qmp('query-block-jobs') 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): image_len = 1 * 1024 * 1024 test_len = 1 * 1024 * 256