diff options
author | Fam Zheng <famz@redhat.com> | 2013-11-20 10:01:53 +0800 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2013-11-29 13:40:37 +0100 |
commit | 5b43dbb699599cdb9f75a624cb28d4f709ad2cdf (patch) | |
tree | 5f1528fb57c7acdd2fdec49bcc228e1130e8dc1e /tests/qemu-iotests/040 | |
parent | b3af018f3babfe7a0328759a86c00a6a6b4f6443 (diff) | |
download | qemu-5b43dbb699599cdb9f75a624cb28d4f709ad2cdf.zip qemu-5b43dbb699599cdb9f75a624cb28d4f709ad2cdf.tar.gz qemu-5b43dbb699599cdb9f75a624cb28d4f709ad2cdf.tar.bz2 |
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>
Diffstat (limited to 'tests/qemu-iotests/040')
-rwxr-xr-x | tests/qemu-iotests/040 | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/tests/qemu-iotests/040 b/tests/qemu-iotests/040 index a2e18c5..0e85136 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 |