From: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
To: Stefan Hajnoczi <stefanha@gmail.com>
Cc: kwolf@redhat.com, phrdina@redhat.com, famz@redhat.com,
qemu-devel@nongnu.org, armbru@redhat.com, lcapitulino@redhat.com,
stefanha@redhat.com, pbonzini@redhat.com, dietmar@proxmox.com
Subject: Re: [Qemu-devel] [PATCH V2 12/12] qemu-iotests: add 055 internal snapshot for block device test case
Date: Wed, 19 Jun 2013 14:21:31 +0800 [thread overview]
Message-ID: <51C14DEB.4050702@linux.vnet.ibm.com> (raw)
In-Reply-To: <20130618143212.GP7649@stefanha-thinkpad.redhat.com>
于 2013-6-18 22:32, Stefan Hajnoczi 写道:
> On Fri, Jun 14, 2013 at 07:39:59PM +0800, Wenchao Xia wrote:
>> Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com>
>> ---
>> tests/qemu-iotests/055 | 157 ++++++++++++++++++++++++++++++++++++++++++++
>> tests/qemu-iotests/055.out | 5 ++
>
> drive-backup already uses 055, please name it 056 to avoid conflicts.
>
OK.
>> tests/qemu-iotests/group | 1 +
>> 3 files changed, 163 insertions(+), 0 deletions(-)
>> create mode 100755 tests/qemu-iotests/055
>> create mode 100644 tests/qemu-iotests/055.out
>>
>> diff --git a/tests/qemu-iotests/055 b/tests/qemu-iotests/055
>> new file mode 100755
>> index 0000000..7658f22
>> --- /dev/null
>> +++ b/tests/qemu-iotests/055
>> @@ -0,0 +1,157 @@
>> +#!/usr/bin/env python
>> +#
>> +# Tests for internal snapshot.
>> +#
>
> Copyright (C) 2013 IBM ...
>
> Based on 055:
>
oops....
>> +# Copyright (C) 2012 Red Hat, Inc.
>> +#
>> +# This program is free software; you can redistribute it and/or modify
>> +# it under the terms of the GNU General Public License as published by
>> +# the Free Software Foundation; either version 2 of the License, or
>> +# (at your option) any later version.
>> +#
>> +# This program is distributed in the hope that it will be useful,
>> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
>> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>> +# GNU General Public License for more details.
>> +#
>> +# You should have received a copy of the GNU General Public License
>> +# along with this program. If not, see <http://www.gnu.org/licenses/>.
>> +#
>> +
>> +import time
>> +import os
>> +import iotests
>> +from iotests import qemu_img, qemu_io
>> +
>> +test_drv_base_name = 'drive'
>> +
>> +class ImageSnapshotTestCase(iotests.QMPTestCase):
>> + image_len = 120 * 1024 * 1024 # MB
>> +
>> + def __init__(self, *args):
>> + self.expect = []
>> + super(ImageSnapshotTestCase, self).__init__(*args)
>> +
>> + def _setUp(self, test_img_base_name, image_num):
>> + self.vm = iotests.VM()
>> + for i in range(0, image_num):
>> + filename = '%s%d' % (test_img_base_name, i)
>> + img = os.path.join(iotests.test_dir, filename)
>> + device = '%s%d' % (test_drv_base_name, i)
>> + qemu_img('create', '-f', iotests.imgfmt, img, str(self.image_len))
>> + self.vm.add_drive(img)
>> + self.expect.append({'image': img, 'device': device,
>> + 'snapshots': [], 'snapshots_name_counter': 0})
>> + self.vm.launch()
>> +
>> + def tearDown(self):
>> + self.vm.shutdown()
>> + for i in range(0, len(self.expect)):
>> + os.remove(self.expect[i]['image'])
>> +
>> + def createSnapshotInTransaction(self, snapshot_num):
>> + actions = []
>> + for i in range(0, len(self.expect)):
>> + num = self.expect[i]['snapshots_name_counter']
>> + for j in range(0, snapshot_num):
>> + name = '%s_sn%d' % (self.expect[i]['device'], num)
>> + num = num + 1
>> + self.expect[i]['snapshots'].append(name)
>> + actions.append({
>> + 'type': 'blockdev-snapshot-internal-sync',
>> + 'data': { 'device': self.expect[i]['device'],
>> + 'name': name },
>> + })
>> + self.expect[i]['snapshots_name_counter'] = num
>> + result = self.vm.qmp('transaction', actions = actions)
>> + self.assert_qmp(result, 'return', {})
>
> This tests the success case. Please also use the 'Abort' action to test
> the error case.
Is "Abort" upstreamed? If yes I will add that part.
>
>> + def verifySnapshotInfo(self):
>> + expect = self.expect
>> + result = self.vm.qmp('query-block')
>> + for i in range(0, len(expect)):
>> + image = None
>> + for device in result['return']:
>> + if device['device'] == expect[i]['device']:
>> + image = device['inserted']['image']
>> + break
>> + self.assertTrue(image != None)
>> + self.assertTrue(len(image['snapshots']) ==
>> + len(expect[i]['snapshots']))
>> + for j in range(0, len(image['snapshots'])):
>> + try:
>> + expect[i]['snapshots'].index(image['snapshots'][j]['name'])
>> + except:
>> + print 'not full match, image info:\n%s\n, expect:%s\n' % \
>> + (str(image), str(expect))
>> + self.assertTrue(False)
>> +
>> + def deleteSnapshot(self, device, name):
>> + result = self.vm.qmp('blockdev-snapshot-delete-internal-sync',
>> + device = device,
>> + name = name)
>> + self.assert_qmp(result, 'return', {})
>> + expect = self.expect
>> + sn_list_expect = None
>> + for i in range(0, len(expect)):
>> + if expect[i]['device'] == device :
>> + sn_list_expect = expect[i]['snapshots']
>> + break
>> + self.assertTrue(sn_list_expect != None)
>> + try:
>> + sn_list_expect.remove(name)
>> + except:
>> + print 'snapshot %s not found in expect:\n%s\n' % \
>> + (name, str(expect))
>> + self.assertTrue(False)
>> +
>> +class TestSingleTransaction(ImageSnapshotTestCase):
>> + def setUp(self):
>> + self._setUp('test_a.img', 1)
>> +
>> + def test_create(self):
>> + self.createSnapshotInTransaction(1)
>> + self.verifySnapshotInfo()
>> +
>> + def test_error_name(self):
>> + actions = [{'type': 'blockdev-snapshot-internal-sync',
>> + 'data': { 'device': self.expect[0]['device'],
>> + 'name': '1234' },
>> + }]
>> + result = self.vm.qmp('transaction', actions = actions)
>> + self.assert_qmp(result, 'error/class', 'GenericError')
>
> Please check that empty names error too.
>
OK.
--
Best Regards
Wenchao Xia
next prev parent reply other threads:[~2013-06-19 6:21 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-14 11:39 [Qemu-devel] [PATCH V2 00/12] add internal snapshot support at block device level Wenchao Xia
2013-06-14 11:39 ` [Qemu-devel] [PATCH V2 01/12] blockdev: drop redundant proto_drv check Wenchao Xia
2013-06-14 11:39 ` [Qemu-devel] [PATCH V2 02/12] blockdev: rename BlkTransactionStates to singular Wenchao Xia
2013-06-14 11:39 ` [Qemu-devel] [PATCH V2 03/12] blockdev: allow BdrvActionOps->commit() to be NULL Wenchao Xia
2013-06-14 11:39 ` [Qemu-devel] [PATCH V2 04/12] snapshot: new function bdrv_snapshot_find_by_id_and_name() Wenchao Xia
2013-06-14 11:39 ` [Qemu-devel] [PATCH V2 05/12] snapshot: add paired functions for internal snapshot id and name Wenchao Xia
2013-06-14 11:39 ` [Qemu-devel] [PATCH V2 06/12] snapshot: distinguish id and name in snapshot delete Wenchao Xia
2013-06-14 11:39 ` [Qemu-devel] [PATCH V2 07/12] qmp: add internal snapshot support in qmp_transaction Wenchao Xia
2013-06-15 9:40 ` Eric Blake
2013-06-17 2:43 ` Wenchao Xia
2013-06-18 14:09 ` Stefan Hajnoczi
2013-06-14 11:39 ` [Qemu-devel] [PATCH V2 08/12] qmp: add interface blockdev-snapshot-internal-sync Wenchao Xia
2013-06-15 9:51 ` Eric Blake
2013-06-17 3:09 ` Wenchao Xia
2013-06-14 11:39 ` [Qemu-devel] [PATCH V2 09/12] qmp: add interface blockdev-snapshot-delete-internal-sync Wenchao Xia
2013-06-15 9:55 ` Eric Blake
2013-06-17 3:25 ` Wenchao Xia
2013-06-18 14:20 ` Stefan Hajnoczi
2013-06-19 6:18 ` Wenchao Xia
2013-06-19 7:46 ` Stefan Hajnoczi
2013-06-19 8:53 ` Wenchao Xia
2013-06-19 14:24 ` Stefan Hajnoczi
2013-06-20 2:37 ` Wenchao Xia
2013-06-14 11:39 ` [Qemu-devel] [PATCH V2 10/12] hmp: add interface hmp_snapshot_blkdev_internal Wenchao Xia
2013-06-14 11:39 ` [Qemu-devel] [PATCH V2 11/12] hmp: add interface hmp_snapshot_delete_blkdev_internal Wenchao Xia
2013-06-14 11:39 ` [Qemu-devel] [PATCH V2 12/12] qemu-iotests: add 055 internal snapshot for block device test case Wenchao Xia
2013-06-18 14:32 ` Stefan Hajnoczi
2013-06-19 6:21 ` Wenchao Xia [this message]
2013-06-19 7:46 ` Stefan Hajnoczi
2013-06-19 9:01 ` Wenchao Xia
2013-06-19 14:26 ` Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51C14DEB.4050702@linux.vnet.ibm.com \
--to=xiawenc@linux.vnet.ibm.com \
--cc=armbru@redhat.com \
--cc=dietmar@proxmox.com \
--cc=famz@redhat.com \
--cc=kwolf@redhat.com \
--cc=lcapitulino@redhat.com \
--cc=pbonzini@redhat.com \
--cc=phrdina@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@gmail.com \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).