From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:46969)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1Yt5dM-0000TR-4M
	for qemu-devel@nongnu.org; Thu, 14 May 2015 22:45:56 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1Yt5dK-0006jA-W1
	for qemu-devel@nongnu.org; Thu, 14 May 2015 22:45:56 -0400
Date: Fri, 15 May 2015 10:45:46 +0800
From: Fam Zheng <famz@redhat.com>
Message-ID: <20150515024546.GK28144@ad.nay.redhat.com>
References: <cover.1431523498.git.berto@igalia.com>
	<2c8aeb237820f29ce2fe43ea0ceb7a4f69b14d7b.1431523498.git.berto@igalia.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <2c8aeb237820f29ce2fe43ea0ceb7a4f69b14d7b.1431523498.git.berto@igalia.com>
Subject: Re: [Qemu-devel] [PATCH 09/11] qemu-iotests: test streaming to an
 intermediate layer
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Alberto Garcia <berto@igalia.com>
Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org

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 <berto@igalia.com>
> Reviewed-by: Max Reitz <mreitz@redhat.com>

Reviewed-by: Fam Zheng <famz@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
> 
>