[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v10 11/16] qemu-iotests: Test streaming to an interm
From: |
Alberto Garcia |
Subject: |
[Qemu-devel] [PATCH v10 11/16] qemu-iotests: Test streaming to an intermediate layer |
Date: |
Thu, 6 Oct 2016 16:02:54 +0300 |
This adds test_stream_intermediate(), similar to test_stream() but
streams to the intermediate image instead.
It also removes the usage of blkdebug, which is unnecessary for this
test.
Signed-off-by: Alberto Garcia <address@hidden>
---
tests/qemu-iotests/030 | 21 ++++++++++++++++++++-
tests/qemu-iotests/030.out | 4 ++--
2 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030
index 107049b..367ecf8 100755
--- a/tests/qemu-iotests/030
+++ b/tests/qemu-iotests/030
@@ -36,7 +36,7 @@ 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)
+ self.vm = iotests.VM().add_drive(test_img, "backing.node-name=mid")
self.vm.launch()
def tearDown(self):
@@ -60,6 +60,25 @@ 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()
+
+ self.assertNotEqual(qemu_io('-f', 'raw', '-c', 'map', backing_img),
+ qemu_io('-f', iotests.imgfmt, '-c', 'map',
mid_img),
+ 'image file map matches backing file before
streaming')
+
+ result = self.vm.qmp('block-stream', device='mid', job_id='stream-mid')
+ self.assert_qmp(result, 'return', {})
+
+ self.wait_until_completed(drive='stream-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.9.3
- [Qemu-devel] [PATCH v10 04/16] block: Use block_job_add_bdrv() in backup_start(), (continued)
- [Qemu-devel] [PATCH v10 04/16] block: Use block_job_add_bdrv() in backup_start(), Alberto Garcia, 2016/10/06
- [Qemu-devel] [PATCH v10 16/16] qemu-iotests: Test streaming to a Quorum child, Alberto Garcia, 2016/10/06
- [Qemu-devel] [PATCH v10 10/16] docs: Document how to stream to an intermediate layer, Alberto Garcia, 2016/10/06
- [Qemu-devel] [PATCH v10 15/16] qemu-iotests: Add iotests.supports_quorum(), Alberto Garcia, 2016/10/06
- [Qemu-devel] [PATCH v10 13/16] qemu-iotests: Test overlapping stream and commit operations, Alberto Garcia, 2016/10/06
- [Qemu-devel] [PATCH v10 12/16] qemu-iotests: Test block-stream operations in parallel, Alberto Garcia, 2016/10/06
- [Qemu-devel] [PATCH v10 14/16] qemu-iotests: Test block-stream and block-commit in parallel, Alberto Garcia, 2016/10/06
- [Qemu-devel] [PATCH v10 11/16] qemu-iotests: Test streaming to an intermediate layer,
Alberto Garcia <=