diff mbox

[08/11] qemu-iotests: add no-op streaming test

Message ID e96826c89daa1d0e623ddd527df087987209ad46.1429885069.git.berto@igalia.com
State New
Headers show

Commit Message

Alberto Garcia April 24, 2015, 3:01 p.m. UTC
This patch tests that in a partial block-stream operation, no data is
ever copied from the base image.

Signed-off-by: Alberto Garcia <berto@igalia.com>
---
 tests/qemu-iotests/030     | 18 ++++++++++++++++++
 tests/qemu-iotests/030.out |  4 ++--
 2 files changed, 20 insertions(+), 2 deletions(-)

Comments

Max Reitz April 24, 2015, 3:19 p.m. UTC | #1
On 24.04.2015 17:01, Alberto Garcia wrote:
> This patch tests that in a partial block-stream operation, no data is
> ever copied from the base image.
>
> Signed-off-by: Alberto Garcia <berto@igalia.com>
> ---
>   tests/qemu-iotests/030     | 18 ++++++++++++++++++
>   tests/qemu-iotests/030.out |  4 ++--
>   2 files changed, 20 insertions(+), 2 deletions(-)
>
> diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030
> index 6e6cb5a..bc53885 100755
> --- a/tests/qemu-iotests/030
> +++ b/tests/qemu-iotests/030
> @@ -91,6 +91,24 @@ 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_no_op(self):
> +        self.assert_no_active_block_jobs()
> +
> +        # The image map is empty before the operation
> +        empty_map = qemu_io('-f', iotests.imgfmt, '-c', 'map', test_img)

Oh, that was too obvious. :-)

Reviewed-by: Max Reitz <mreitz@redhat.com>

> +
> +        # This is a no-op: no data should ever be copied from the base image
> +        result = self.vm.qmp('block-stream', device='drive0', base=mid_img)
> +        self.assert_qmp(result, 'return', {})
> +
> +        self.wait_until_completed()
> +
> +        self.assert_no_active_block_jobs()
> +        self.vm.shutdown()
> +
> +        self.assertEqual(qemu_io('-f', iotests.imgfmt, '-c', 'map', test_img),
> +                         empty_map, 'image file map changed after a no-op')
> +
>       def test_stream_partial(self):
>           self.assert_no_active_block_jobs()
>   
> diff --git a/tests/qemu-iotests/030.out b/tests/qemu-iotests/030.out
> index fa16b5c..6323079 100644
> --- a/tests/qemu-iotests/030.out
> +++ b/tests/qemu-iotests/030.out
> @@ -1,5 +1,5 @@
> -.............
> +..............
>   ----------------------------------------------------------------------
> -Ran 13 tests
> +Ran 14 tests
>   
>   OK
diff mbox

Patch

diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030
index 6e6cb5a..bc53885 100755
--- a/tests/qemu-iotests/030
+++ b/tests/qemu-iotests/030
@@ -91,6 +91,24 @@  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_no_op(self):
+        self.assert_no_active_block_jobs()
+
+        # The image map is empty before the operation
+        empty_map = qemu_io('-f', iotests.imgfmt, '-c', 'map', test_img)
+
+        # This is a no-op: no data should ever be copied from the base image
+        result = self.vm.qmp('block-stream', device='drive0', base=mid_img)
+        self.assert_qmp(result, 'return', {})
+
+        self.wait_until_completed()
+
+        self.assert_no_active_block_jobs()
+        self.vm.shutdown()
+
+        self.assertEqual(qemu_io('-f', iotests.imgfmt, '-c', 'map', test_img),
+                         empty_map, 'image file map changed after a no-op')
+
     def test_stream_partial(self):
         self.assert_no_active_block_jobs()
 
diff --git a/tests/qemu-iotests/030.out b/tests/qemu-iotests/030.out
index fa16b5c..6323079 100644
--- a/tests/qemu-iotests/030.out
+++ b/tests/qemu-iotests/030.out
@@ -1,5 +1,5 @@ 
-.............
+..............
 ----------------------------------------------------------------------
-Ran 13 tests
+Ran 14 tests
 
 OK