Re: [Qemu-block] [Qemu-devel] [PATCH 07/11] qemu-iotests: fix test_stream_partial()

[Fam Zheng]

On Wed, 05/13 16:27, Alberto Garcia wrote:
> This test is streaming to the top layer using the intermediate image
> as the base. This is a mistake since block-stream never copies data
> from the base image and its backing chain, so this is effectively a
> no-op.
> 
> In addition to fixing the base parameter, this patch also writes some
> data to the intermediate image before the test, so there's something
> to copy and the test is meaningful.
> 
> Signed-off-by: Alberto Garcia <address@hidden>
> Reviewed-by: Max Reitz <address@hidden>

Reviewed-by: Fam Zheng <address@hidden>


> ---
>  tests/qemu-iotests/030 | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030
> index 7ca9b25..6e6cb5a 100755
> --- a/tests/qemu-iotests/030
> +++ b/tests/qemu-iotests/030
> @@ -35,6 +35,7 @@ class TestSingleDrive(iotests.QMPTestCase):
>          qemu_img('create', '-f', iotests.imgfmt, '-o', 'backing_file=%s' % 
> backing_img, mid_img)
>          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)
>          self.vm.launch()
>  
> @@ -93,7 +94,7 @@ class TestSingleDrive(iotests.QMPTestCase):
>      def test_stream_partial(self):
>          self.assert_no_active_block_jobs()
>  
> -        result = self.vm.qmp('block-stream', device='drive0', base=mid_img)
> +        result = self.vm.qmp('block-stream', device='drive0', 
> base=backing_img)
>          self.assert_qmp(result, 'return', {})
>  
>          self.wait_until_completed()
> -- 
> 2.1.4
> 
>