On 04/17/2014 03:59 PM, Max Reitz wrote: > As the length of a mirror block job no longer directly depends on the > size of the block device, drop the related checks from this test. > > As 041 uses the wait_until_completed function from iotests.py, that > check has to be dropped there as well which in turn affects test 055. 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 <mre...@redhat.com> > --- > tests/qemu-iotests/040 | 3 --- > tests/qemu-iotests/041 | 2 -- > tests/qemu-iotests/iotests.py | 2 -- > 3 files changed, 7 deletions(-) > > diff --git a/tests/qemu-iotests/040 b/tests/qemu-iotests/040 > index 734b6a6..437af2b 100755 > --- a/tests/qemu-iotests/040 > +++ b/tests/qemu-iotests/040 > @@ -46,13 +46,10 @@ 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)
But shouldn't you replace this with an assertion that 'data/offset' and 'data/len' have converged to the same value? > +++ b/tests/qemu-iotests/041 > @@ -46,8 +46,6 @@ class ImageMirroringTestCase(iotests.QMPTestCase): > event = self.cancel_and_wait() > 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) And again. You can't enforce that they are the same as the image_len, but you SHOULD enforce that they are the same as each other at the completion of the job. > > 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 e4fa9af..0d3ff24 100644 > --- a/tests/qemu-iotests/iotests.py > +++ b/tests/qemu-iotests/iotests.py > @@ -265,8 +265,6 @@ class QMPTestCase(unittest.TestCase): > if event['event'] == 'BLOCK_JOB_COMPLETED': > self.assert_qmp(event, 'data/device', drive) > self.assert_qmp_absent(event, 'data/error') > - self.assert_qmp(event, 'data/offset', self.image_len) > - self.assert_qmp(event, 'data/len', self.image_len) and again -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
