| Message ID | dad8718832c048dbccdef4c6676ba2d97ae616fe.1429196435.git.berto@igalia.com |
|---|---|
| State | New |
| Headers | show |
On 16.04.2015 17:12, 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> > --- > tests/qemu-iotests/030 | 18 +++++++++++++++++- > tests/qemu-iotests/030.out | 4 ++-- > 2 files changed, 19 insertions(+), 3 deletions(-) Reviewed-by: Max Reitz <mreitz@redhat.com>
On 04/16/2015 09:12 AM, 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> > --- > tests/qemu-iotests/030 | 18 +++++++++++++++++- > tests/qemu-iotests/030.out | 4 ++-- > 2 files changed, 19 insertions(+), 3 deletions(-) > I'm wondering if we should also test a multi-file stream. That is, starting from: A <- B <- C <- D <- E and rebasing so that A is the backing file of D (pulling both B and C into D): A <- D <- E we should be able to verify that B and C are unchanged, and that D picked up changes from both intermediate files (in particular, it's nice to test that we aren't being inefficient by breaking the operation into two steps: streaming B into C then C into D would give the same end result in D, but would waste time for any clusters in B that were not changed in C but were changed in D). But such a test could be a separate patch, so I don't see anything wrong with this new test as-is.
diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030 index 6e6cb5a..69ada2b 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 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
This adds test_stream_intermediate(), similar to test_stream() but streams to the intermediate image instead. Signed-off-by: Alberto Garcia <berto@igalia.com> --- tests/qemu-iotests/030 | 18 +++++++++++++++++- tests/qemu-iotests/030.out | 4 ++-- 2 files changed, 19 insertions(+), 3 deletions(-)