[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/13] block: Adds mirroring tests for resized image
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 03/13] block: Adds mirroring tests for resized images |
Date: |
Fri, 1 Feb 2013 15:27:54 +0100 |
From: Vishvananda Ishaya <address@hidden>
This test verifies two mirroring issues are fixed with resized images:
* sync='top' creates an image that is the proper size
* sync='full' doesn't cause an assertion failure and crash qemu
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
tests/qemu-iotests/041 | 48 ++++++++++++++++++++++++++++++++++++++++++++++
tests/qemu-iotests/041.out | 4 ++--
2 files changed, 50 insertions(+), 2 deletions(-)
diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041
index b040820..720eeff 100755
--- a/tests/qemu-iotests/041
+++ b/tests/qemu-iotests/041
@@ -344,6 +344,54 @@ class TestMirrorNoBacking(ImageMirroringTestCase):
self.assertTrue(self.compare_images(test_img, target_img),
'target image does not match source after mirroring')
+class TestMirrorResized(ImageMirroringTestCase):
+ backing_len = 1 * 1024 * 1024 # MB
+ image_len = 2 * 1024 * 1024 # MB
+
+ def setUp(self):
+ self.create_image(backing_img, TestMirrorResized.backing_len)
+ qemu_img('create', '-f', iotests.imgfmt, '-o', 'backing_file=%s' %
backing_img, test_img)
+ qemu_img('resize', test_img, '2M')
+ self.vm = iotests.VM().add_drive(test_img)
+ self.vm.launch()
+
+ def tearDown(self):
+ self.vm.shutdown()
+ os.remove(test_img)
+ os.remove(backing_img)
+ try:
+ os.remove(target_img)
+ except OSError:
+ pass
+
+ def test_complete_top(self):
+ self.assert_no_active_mirrors()
+
+ result = self.vm.qmp('drive-mirror', device='drive0', sync='top',
+ target=target_img)
+ self.assert_qmp(result, 'return', {})
+
+ self.complete_and_wait()
+ result = self.vm.qmp('query-block')
+ self.assert_qmp(result, 'return[0]/inserted/file', target_img)
+ self.vm.shutdown()
+ self.assertTrue(self.compare_images(test_img, target_img),
+ 'target image does not match source after mirroring')
+
+ def test_complete_full(self):
+ self.assert_no_active_mirrors()
+
+ result = self.vm.qmp('drive-mirror', device='drive0', sync='full',
+ target=target_img)
+ self.assert_qmp(result, 'return', {})
+
+ self.complete_and_wait()
+ result = self.vm.qmp('query-block')
+ self.assert_qmp(result, 'return[0]/inserted/file', target_img)
+ self.vm.shutdown()
+ self.assertTrue(self.compare_images(test_img, target_img),
+ 'target image does not match source after mirroring')
+
class TestReadErrors(ImageMirroringTestCase):
image_len = 2 * 1024 * 1024 # MB
diff --git a/tests/qemu-iotests/041.out b/tests/qemu-iotests/041.out
index 84bfd63..42314e9 100644
--- a/tests/qemu-iotests/041.out
+++ b/tests/qemu-iotests/041.out
@@ -1,5 +1,5 @@
-......................
+........................
----------------------------------------------------------------------
-Ran 22 tests
+Ran 24 tests
OK
--
1.8.1
- [Qemu-devel] [PULL for-1.4 00/13] Block patches, Stefan Hajnoczi, 2013/02/01
- [Qemu-devel] [PATCH 01/13] qemu-iotests: Add regression test for b7ab0fea, Stefan Hajnoczi, 2013/02/01
- [Qemu-devel] [PATCH 02/13] block: Fix is_allocated_above with resized files, Stefan Hajnoczi, 2013/02/01
- [Qemu-devel] [PATCH 03/13] block: Adds mirroring tests for resized images,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 04/13] vmdk: Allow selecting SCSI adapter in image creation, Stefan Hajnoczi, 2013/02/01
- [Qemu-devel] [PATCH 05/13] sheepdog: pass vdi_id to sheep daemon for sd_close(), Stefan Hajnoczi, 2013/02/01
- [Qemu-devel] [PATCH 07/13] cloop: Fix bdrv_open() error handling, Stefan Hajnoczi, 2013/02/01
- [Qemu-devel] [PATCH 06/13] bochs: Fix bdrv_open() error handling, Stefan Hajnoczi, 2013/02/01
- [Qemu-devel] [PATCH 09/13] dmg: Fix bdrv_open() error handling, Stefan Hajnoczi, 2013/02/01
- [Qemu-devel] [PATCH 08/13] vpc: Fix bdrv_open() error handling, Stefan Hajnoczi, 2013/02/01
- [Qemu-devel] [PATCH 10/13] dmg: Use g_free instead of free, Stefan Hajnoczi, 2013/02/01
- [Qemu-devel] [PATCH 11/13] parallels: Fix bdrv_open() error handling, Stefan Hajnoczi, 2013/02/01
- [Qemu-devel] [PATCH 12/13] vmdk: Allow space in file name, Stefan Hajnoczi, 2013/02/01