[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v10 14/14] iotests: Omit length/offset test in 040 a
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v10 14/14] iotests: Omit length/offset test in 040 and 041 |
Date: |
Tue, 22 Jul 2014 23:29:27 +0200 |
As the length of a mirror block job no longer directly depends on the
size of the block device, drop those checks from this test. Instead,
just check whether the final offset equals the block job length.
As 041 uses the wait_until_completed function from iotests.py, the same
applies there as well which in turn affects tests 030, 055 and 056. On
the other hand, a block job's length does not have to be related to the
length of the image file in the first place, so that check was
questionable anyway.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
tests/qemu-iotests/040 | 4 +---
tests/qemu-iotests/041 | 3 +--
tests/qemu-iotests/iotests.py | 3 +--
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/tests/qemu-iotests/040 b/tests/qemu-iotests/040
index f1e16c1..2b432ad 100755
--- a/tests/qemu-iotests/040
+++ b/tests/qemu-iotests/040
@@ -43,8 +43,7 @@ class ImageCommitTestCase(iotests.QMPTestCase):
if event['event'] == 'BLOCK_JOB_COMPLETED':
self.assert_qmp(event, 'data/type', 'commit')
self.assert_qmp(event, 'data/device', 'drive0')
- self.assert_qmp(event, 'data/offset', self.image_len)
- self.assert_qmp(event, 'data/len', self.image_len)
+ self.assert_qmp(event, 'data/offset', event['data']['len'])
if need_ready:
self.assertTrue(ready, "Expecting BLOCK_JOB_COMPLETED
event")
completed = True
@@ -52,7 +51,6 @@ class ImageCommitTestCase(iotests.QMPTestCase):
ready = True
self.assert_qmp(event, 'data/type', 'commit')
self.assert_qmp(event, 'data/device', 'drive0')
- self.assert_qmp(event, 'data/len', self.image_len)
self.vm.qmp('block-job-complete', device='drive0')
self.assert_no_active_block_jobs()
diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041
index 5dbd4ee..90721cc 100755
--- a/tests/qemu-iotests/041
+++ b/tests/qemu-iotests/041
@@ -52,8 +52,7 @@ class ImageMirroringTestCase(iotests.QMPTestCase):
event = self.cancel_and_wait(drive=drive)
self.assertEquals(event['event'], 'BLOCK_JOB_COMPLETED')
self.assert_qmp(event, 'data/type', 'mirror')
- self.assert_qmp(event, 'data/offset', self.image_len)
- self.assert_qmp(event, 'data/len', self.image_len)
+ self.assert_qmp(event, 'data/offset', event['data']['len'])
def complete_and_wait(self, drive='drive0', wait_ready=True):
'''Complete a block job and wait for it to finish'''
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 39a4cfc..f57f154 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -267,8 +267,7 @@ class QMPTestCase(unittest.TestCase):
self.assert_qmp(event, 'data/device', drive)
self.assert_qmp_absent(event, 'data/error')
if check_offset:
- self.assert_qmp(event, 'data/offset', self.image_len)
- self.assert_qmp(event, 'data/len', self.image_len)
+ self.assert_qmp(event, 'data/offset',
event['data']['len'])
completed = True
self.assert_no_active_block_jobs()
--
2.0.1
- [Qemu-devel] [PATCH v10 04/14] blockjob: Introduce block_job_complete_sync(), (continued)
- [Qemu-devel] [PATCH v10 04/14] blockjob: Introduce block_job_complete_sync(), Max Reitz, 2014/07/22
- [Qemu-devel] [PATCH v10 05/14] blockjob: Add "ready" field, Max Reitz, 2014/07/22
- [Qemu-devel] [PATCH v10 06/14] block/mirror: Improve progress report, Max Reitz, 2014/07/22
- [Qemu-devel] [PATCH v10 07/14] qemu-img: Implement commit like QMP, Max Reitz, 2014/07/22
- [Qemu-devel] [PATCH v10 08/14] qemu-img: Empty image after commit, Max Reitz, 2014/07/22
- [Qemu-devel] [PATCH v10 09/14] qemu-img: Enable progress output for commit, Max Reitz, 2014/07/22
- [Qemu-devel] [PATCH v10 10/14] qemu-img: Specify backing file for commit, Max Reitz, 2014/07/22
- [Qemu-devel] [PATCH v10 11/14] iotests: Add _filter_qemu_img_map, Max Reitz, 2014/07/22
- [Qemu-devel] [PATCH v10 12/14] iotests: Add test for backing-chain commits, Max Reitz, 2014/07/22
- [Qemu-devel] [PATCH v10 13/14] iotests: Add test for qcow2's bdrv_make_empty, Max Reitz, 2014/07/22
- [Qemu-devel] [PATCH v10 14/14] iotests: Omit length/offset test in 040 and 041,
Max Reitz <=