[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 18/18] iotest 055: refactor and speed up
From: |
Max Reitz |
Subject: |
[Qemu-block] [PULL 18/18] iotest 055: refactor and speed up |
Date: |
Wed, 14 Sep 2016 18:41:02 +0200 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
Source disk is created and filled with test data before each test case.
Instead initialize it once for the whole unit.
Test disk filling patterns are merged into one pattern.
Also TestSetSpeed used different image_len for source and target (by
mistake) - this is automatically fixed here.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Message-id: address@hidden
Reviewed-by: Pavel Butsykin <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/055 | 52 +++++++++++++++++---------------------------------
1 file changed, 18 insertions(+), 34 deletions(-)
diff --git a/tests/qemu-iotests/055 b/tests/qemu-iotests/055
index ff4535e..1d3fd04 100755
--- a/tests/qemu-iotests/055
+++ b/tests/qemu-iotests/055
@@ -29,17 +29,24 @@ test_img = os.path.join(iotests.test_dir, 'test.img')
target_img = os.path.join(iotests.test_dir, 'target.img')
blockdev_target_img = os.path.join(iotests.test_dir, 'blockdev-target.img')
-class TestSingleDrive(iotests.QMPTestCase):
- image_len = 64 * 1024 * 1024 # MB
+image_len = 64 * 1024 * 1024 # MB
+
+def setUpModule():
+ qemu_img('create', '-f', iotests.imgfmt, test_img, str(image_len))
+ qemu_io('-f', iotests.imgfmt, '-c', 'write -P0x11 0 64k', test_img)
+ qemu_io('-f', iotests.imgfmt, '-c', 'write -P0x00 64k 128k', test_img)
+ qemu_io('-f', iotests.imgfmt, '-c', 'write -P0x22 162k 32k', test_img)
+ qemu_io('-f', iotests.imgfmt, '-c', 'write -P0xd5 1M 32k', test_img)
+ qemu_io('-f', iotests.imgfmt, '-c', 'write -P0xdc 32M 124k', test_img)
+ qemu_io('-f', iotests.imgfmt, '-c', 'write -P0x33 67043328 64k', test_img)
+def tearDownModule():
+ os.remove(test_img)
+
+
+class TestSingleDrive(iotests.QMPTestCase):
def setUp(self):
- # Write data to the image so we can compare later
- qemu_img('create', '-f', iotests.imgfmt, test_img,
str(TestSingleDrive.image_len))
- qemu_io('-f', iotests.imgfmt, '-c', 'write -P0x5d 0 64k', test_img)
- qemu_io('-f', iotests.imgfmt, '-c', 'write -P0xd5 1M 32k', test_img)
- qemu_io('-f', iotests.imgfmt, '-c', 'write -P0xdc 32M 124k', test_img)
- qemu_io('-f', iotests.imgfmt, '-c', 'write -P0xdc 67043328 64k',
test_img)
- qemu_img('create', '-f', iotests.imgfmt, blockdev_target_img,
str(TestSingleDrive.image_len))
+ qemu_img('create', '-f', iotests.imgfmt, blockdev_target_img,
str(image_len))
self.vm =
iotests.VM().add_drive(test_img).add_drive(blockdev_target_img)
if iotests.qemu_default_machine == 'pc':
@@ -48,7 +55,6 @@ class TestSingleDrive(iotests.QMPTestCase):
def tearDown(self):
self.vm.shutdown()
- os.remove(test_img)
os.remove(blockdev_target_img)
try:
os.remove(target_img)
@@ -155,19 +161,14 @@ class TestSingleDrive(iotests.QMPTestCase):
self.assert_qmp(result, 'error/class', 'GenericError')
class TestSetSpeed(iotests.QMPTestCase):
- image_len = 80 * 1024 * 1024 # MB
-
def setUp(self):
- qemu_img('create', '-f', iotests.imgfmt, test_img,
str(TestSetSpeed.image_len))
- qemu_io('-f', iotests.imgfmt, '-c', 'write -P1 0 512', test_img)
- qemu_img('create', '-f', iotests.imgfmt, blockdev_target_img,
str(TestSingleDrive.image_len))
+ qemu_img('create', '-f', iotests.imgfmt, blockdev_target_img,
str(image_len))
self.vm =
iotests.VM().add_drive(test_img).add_drive(blockdev_target_img)
self.vm.launch()
def tearDown(self):
self.vm.shutdown()
- os.remove(test_img)
os.remove(blockdev_target_img)
try:
os.remove(target_img)
@@ -243,15 +244,8 @@ class TestSetSpeed(iotests.QMPTestCase):
self.do_test_set_speed_invalid('blockdev-backup', 'drive1')
class TestSingleTransaction(iotests.QMPTestCase):
- image_len = 64 * 1024 * 1024 # MB
-
def setUp(self):
- qemu_img('create', '-f', iotests.imgfmt, test_img,
str(TestSingleTransaction.image_len))
- qemu_io('-f', iotests.imgfmt, '-c', 'write -P0x5d 0 64k', test_img)
- qemu_io('-f', iotests.imgfmt, '-c', 'write -P0xd5 1M 32k', test_img)
- qemu_io('-f', iotests.imgfmt, '-c', 'write -P0xdc 32M 124k', test_img)
- qemu_io('-f', iotests.imgfmt, '-c', 'write -P0xdc 67043328 64k',
test_img)
- qemu_img('create', '-f', iotests.imgfmt, blockdev_target_img,
str(TestSingleDrive.image_len))
+ qemu_img('create', '-f', iotests.imgfmt, blockdev_target_img,
str(image_len))
self.vm =
iotests.VM().add_drive(test_img).add_drive(blockdev_target_img)
if iotests.qemu_default_machine == 'pc':
@@ -260,7 +254,6 @@ class TestSingleTransaction(iotests.QMPTestCase):
def tearDown(self):
self.vm.shutdown()
- os.remove(test_img)
os.remove(blockdev_target_img)
try:
os.remove(target_img)
@@ -454,17 +447,8 @@ class TestDriveCompression(iotests.QMPTestCase):
fmt_supports_compression = [{'type': 'qcow2', 'args': ()},
{'type': 'vmdk', 'args': ('-o',
'subformat=streamOptimized')}]
- def setUp(self):
- # Write data to the image so we can compare later
- qemu_img('create', '-f', iotests.imgfmt, test_img,
str(TestDriveCompression.image_len))
- qemu_io('-f', iotests.imgfmt, '-c', 'write -P0x11 0 64k', test_img)
- qemu_io('-f', iotests.imgfmt, '-c', 'write -P0x00 64k 128k', test_img)
- qemu_io('-f', iotests.imgfmt, '-c', 'write -P0x22 162k 32k', test_img)
- qemu_io('-f', iotests.imgfmt, '-c', 'write -P0x33 67043328 64k',
test_img)
-
def tearDown(self):
self.vm.shutdown()
- os.remove(test_img)
os.remove(blockdev_target_img)
try:
os.remove(target_img)
--
2.5.5
- [Qemu-block] [PULL 08/18] block: BdrvDirtyBitmap serialization interface, (continued)
- [Qemu-block] [PULL 08/18] block: BdrvDirtyBitmap serialization interface, Max Reitz, 2016/09/14
- [Qemu-block] [PULL 10/18] block: More operations for meta dirty bitmap, Max Reitz, 2016/09/14
- [Qemu-block] [PULL 09/18] tests: Add test code for hbitmap serialization, Max Reitz, 2016/09/14
- [Qemu-block] [PULL 11/18] qemu-img: add the 'dd' subcommand, Max Reitz, 2016/09/14
- [Qemu-block] [PULL 12/18] qemu-img: add skip option to dd, Max Reitz, 2016/09/14
- [Qemu-block] [PULL 13/18] blockdev: prepare iSCSI block driver for dynamic loading, Max Reitz, 2016/09/14
- [Qemu-block] [PULL 14/18] blockdev: Add dynamic generation of module_block.h, Max Reitz, 2016/09/14
- [Qemu-block] [PULL 15/18] blockdev: Add dynamic module loading for block drivers, Max Reitz, 2016/09/14
- [Qemu-block] [PULL 16/18] blockdev: Modularize nfs block driver, Max Reitz, 2016/09/14
- [Qemu-block] [PULL 17/18] commit: get the overlay node before manipulating the backing chain, Max Reitz, 2016/09/14
- [Qemu-block] [PULL 18/18] iotest 055: refactor and speed up,
Max Reitz <=
- Re: [Qemu-block] [Qemu-devel] [PULL 00/18] Block layer patches, no-reply, 2016/09/14
- Re: [Qemu-block] [PULL 00/18] Block layer patches, Peter Maydell, 2016/09/15
- [Qemu-block] [PULL 00/18] Block layer patches, Kevin Wolf, 2016/09/27
- [Qemu-block] [PULL 01/18] block: reintroduce bdrv_flush_all, Kevin Wolf, 2016/09/27
- [Qemu-block] [PULL 02/18] qemu: use bdrv_flush_all for vm_stop et al, Kevin Wolf, 2016/09/27
- [Qemu-block] [PULL 03/18] block-backend: remove blk_flush_all, Kevin Wolf, 2016/09/27
- [Qemu-block] [PULL 05/18] block: Drop aio/cache consistency check from qmp_blockdev_add(), Kevin Wolf, 2016/09/27
- [Qemu-block] [PULL 06/18] block/qapi: Use separate options type for curl driver, Kevin Wolf, 2016/09/27
- [Qemu-block] [PULL 08/18] block: Parse 'detect-zeroes' in bdrv_open_common(), Kevin Wolf, 2016/09/27