On Wed, 05/13 16:27, Alberto Garcia wrote: > This adds test_stream_intermediate(), similar to test_stream() but > streams to the intermediate image instead. > > Signed-off-by: Alberto Garcia <be...@igalia.com> > Reviewed-by: Max Reitz <mre...@redhat.com>
Reviewed-by: Fam Zheng <f...@redhat.com> > --- > tests/qemu-iotests/030 | 18 +++++++++++++++++- > tests/qemu-iotests/030.out | 4 ++-- > 2 files changed, 19 insertions(+), 3 deletions(-) > > diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030 > index bc53885..0927457 100755 > --- a/tests/qemu-iotests/030 > +++ b/tests/qemu-iotests/030 > @@ -36,7 +36,8 @@ class TestSingleDrive(iotests.QMPTestCase): > qemu_img('create', '-f', iotests.imgfmt, '-o', 'backing_file=%s' % > mid_img, test_img) > qemu_io('-f', 'raw', '-c', 'write -P 0x1 0 512', backing_img) > qemu_io('-f', iotests.imgfmt, '-c', 'write -P 0x1 524288 512', > mid_img) > - self.vm = iotests.VM().add_drive("blkdebug::" + test_img) > + opts = "backing.node-name=mid" > + self.vm = iotests.VM().add_drive("blkdebug::" + test_img, opts) > self.vm.launch() > > def tearDown(self): > @@ -60,6 +61,21 @@ class TestSingleDrive(iotests.QMPTestCase): > qemu_io('-f', iotests.imgfmt, '-c', 'map', > test_img), > 'image file map does not match backing file after > streaming') > > + def test_stream_intermediate(self): > + self.assert_no_active_block_jobs() > + > + result = self.vm.qmp('block-stream', device='mid') > + self.assert_qmp(result, 'return', {}) > + > + self.wait_until_completed(drive='mid') > + > + self.assert_no_active_block_jobs() > + self.vm.shutdown() > + > + self.assertEqual(qemu_io('-f', 'raw', '-c', 'map', backing_img), > + qemu_io('-f', iotests.imgfmt, '-c', 'map', mid_img), > + 'image file map does not match backing file after > streaming') > + > def test_stream_pause(self): > self.assert_no_active_block_jobs() > > diff --git a/tests/qemu-iotests/030.out b/tests/qemu-iotests/030.out > index 6323079..96961ed 100644 > --- a/tests/qemu-iotests/030.out > +++ b/tests/qemu-iotests/030.out > @@ -1,5 +1,5 @@ > -.............. > +............... > ---------------------------------------------------------------------- > -Ran 14 tests > +Ran 15 tests > > OK > -- > 2.1.4 > >