qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH v3 12/16] qemu-iotests: add mirroring test case
Date: Fri, 19 Oct 2012 18:19:03 +0200	[thread overview]
Message-ID: <50817D77.1080708@redhat.com> (raw)
In-Reply-To: <1350571770-9836-13-git-send-email-pbonzini@redhat.com>

Am 18.10.2012 16:49, schrieb Paolo Bonzini:
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>         v2->v3: new testcases test_cancel_after_ready and
>         test_medium_not_found, removed obsolete workaround
>         for os.remove failure.  Fixed copyright header.
> 
>  tests/qemu-iotests/041     | 364 +++++++++++++++++++++++++++++++++++++++++++++
>  tests/qemu-iotests/041.out |   5 +
>  tests/qemu-iotests/group   |   1 +
>  3 file modificati, 370 inserzioni(+)
>  create mode 100755 tests/qemu-iotests/041
>  create mode 100644 tests/qemu-iotests/041.out
> 
> diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041
> new file mode 100755
> index 0000000..ce99b00
> --- /dev/null
> +++ b/tests/qemu-iotests/041
> @@ -0,0 +1,364 @@
> +#!/usr/bin/env python
> +#
> +# Tests for image mirroring.
> +#
> +# 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
> +import struct
> +
> +backing_img = os.path.join(iotests.test_dir, 'backing.img')
> +target_backing_img = os.path.join(iotests.test_dir, 'target-backing.img')
> +test_img = os.path.join(iotests.test_dir, 'test.img')
> +target_img = os.path.join(iotests.test_dir, 'target.img')
> +
> +class ImageMirroringTestCase(iotests.QMPTestCase):
> +    '''Abstract base class for image mirroring test cases'''
> +
> +    def assert_no_active_mirrors(self):
> +        result = self.vm.qmp('query-block-jobs')
> +        self.assert_qmp(result, 'return', [])
> +
> +    def cancel_and_wait(self, drive='drive0', wait_ready=True):
> +        '''Cancel a block job and wait for it to finish'''
> +        if wait_ready:
> +            ready = False
> +            while not ready:
> +                for event in self.vm.get_qmp_events(wait=True):
> +                    if event['event'] == 'BLOCK_JOB_READY':
> +                        self.assert_qmp(event, 'data/type', 'mirror')
> +                        self.assert_qmp(event, 'data/device', drive)
> +                        ready = True
> +
> +        result = self.vm.qmp('block-job-cancel', device=drive,
> +                             force=not wait_ready)
> +        self.assert_qmp(result, 'return', {})
> +
> +        cancelled = False
> +        while not cancelled:
> +            for event in self.vm.get_qmp_events(wait=True):
> +                if event['event'] == 'BLOCK_JOB_COMPLETED' or \
> +                   event['event'] == 'BLOCK_JOB_CANCELLED':
> +                    self.assert_qmp(event, 'data/type', 'mirror')
> +                    self.assert_qmp(event, 'data/device', drive)
> +                    if wait_ready:
> +                        self.assertEquals(event['event'], 'BLOCK_JOB_COMPLETED')
> +                        self.assert_qmp(event, 'data/offset', self.image_len)
> +                        self.assert_qmp(event, 'data/len', self.image_len)
> +                    cancelled = True
> +
> +        self.assert_no_active_mirrors()
> +
> +    def complete_and_wait(self, drive='drive0', wait_ready=True):
> +        '''Complete a block job and wait for it to finish'''
> +        if wait_ready:
> +            ready = False
> +            while not ready:
> +                for event in self.vm.get_qmp_events(wait=True):
> +                    if event['event'] == 'BLOCK_JOB_READY':
> +                        self.assert_qmp(event, 'data/type', 'mirror')
> +                        self.assert_qmp(event, 'data/device', drive)
> +                        ready = True
> +
> +        result = self.vm.qmp('block-job-complete', device=drive)
> +        self.assert_qmp(result, 'return', {})
> +
> +        completed = False
> +        while not completed:
> +            for event in self.vm.get_qmp_events(wait=True):
> +                if event['event'] == 'BLOCK_JOB_COMPLETED':
> +                    self.assert_qmp(event, 'data/type', 'mirror')
> +                    self.assert_qmp(event, 'data/device', drive)
> +                    self.assert_qmp_absent(event, 'data/error')
> +                    self.assert_qmp(event, 'data/offset', self.image_len)
> +                    self.assert_qmp(event, 'data/len', self.image_len)
> +                    completed = True
> +
> +        self.assert_no_active_mirrors()
> +
> +    def create_image(self, name, size):
> +        file = open(name, 'w')
> +        i = 0
> +        while i < size:
> +            sector = struct.pack('>l504xl', i / 512, i / 512)
> +            file.write(sector)
> +            i = i + 512
> +        file.close()
> +
> +    def compare_images(self, img1, img2):
> +        try:
> +            qemu_img('convert', '-f', iotests.imgfmt, '-O', 'raw', img1, img1 + '.raw')
> +            qemu_img('convert', '-f', iotests.imgfmt, '-O', 'raw', img2, img2 + '.raw')
> +            file1 = open(img1 + '.raw', 'r')
> +            file2 = open(img2 + '.raw', 'r')
> +            return file1.read() == file2.read()
> +        finally:
> +            if file1 is not None:
> +                file1.close()
> +            if file2 is not None:
> +                file2.close()
> +            try:
> +                os.remove(img1 + '.raw')
> +            except OSError:
> +                pass
> +            try:
> +                os.remove(img2 + '.raw')
> +            except OSError:
> +                pass
> +
> +class TestSingleDrive(ImageMirroringTestCase):
> +    image_len = 1 * 1024 * 1024 # MB
> +
> +    def setUp(self):
> +        self.create_image(backing_img, TestSingleDrive.image_len)
> +        qemu_img('create', '-f', iotests.imgfmt, '-o', 'backing_file=%s' % backing_img, test_img)
> +        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(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')
> +
> +    def test_cancel(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.cancel_and_wait(wait_ready=False)
> +        result = self.vm.qmp('query-block')
> +        self.assert_qmp(result, 'return[0]/inserted/file', test_img)
> +        self.vm.shutdown()
> +        self.assertTrue(self.compare_images(test_img, target_img),
> +                        'target image does not match source after mirroring')

Hm, shouldn't the image comparison actually fail when cancelling before
the job was ready?

Kevin

  reply	other threads:[~2012-10-19 16:19 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-18 14:49 [Qemu-devel] [PULL for Kevin 00/16] Block job improvements part 2 Paolo Bonzini
2012-10-18 14:49 ` [Qemu-devel] [PATCH v3 01/16] block: add bdrv_query_info Paolo Bonzini
2012-10-18 14:49 ` [Qemu-devel] [PATCH v3 02/16] block: add bdrv_query_stats Paolo Bonzini
2012-10-18 14:49 ` [Qemu-devel] [PATCH v3 03/16] block: add bdrv_open_backing_file Paolo Bonzini
2012-10-18 14:49 ` [Qemu-devel] [PATCH v3 04/16] block: introduce new dirty bitmap functionality Paolo Bonzini
2012-10-18 14:49 ` [Qemu-devel] [PATCH v3 05/16] block: export dirty bitmap information in query-block Paolo Bonzini
2012-10-18 16:51   ` Eric Blake
2012-10-18 14:49 ` [Qemu-devel] [PATCH v3 06/16] block: rename block_job_complete to block_job_completed Paolo Bonzini
2012-10-18 14:49 ` [Qemu-devel] [PATCH v3 07/16] block: add block-job-complete Paolo Bonzini
2012-10-18 14:49 ` [Qemu-devel] [PATCH v3 08/16] block: introduce BLOCK_JOB_READY event Paolo Bonzini
2012-10-18 16:58   ` Eric Blake
2012-10-18 14:49 ` [Qemu-devel] [PATCH v3 09/16] mirror: introduce mirror job Paolo Bonzini
2012-10-18 14:49 ` [Qemu-devel] [PATCH v3 10/16] qmp: add drive-mirror command Paolo Bonzini
2012-10-18 17:34   ` Eric Blake
2012-10-19 12:54   ` Kevin Wolf
2012-10-19 13:13     ` Paolo Bonzini
2012-10-18 14:49 ` [Qemu-devel] [PATCH v3 11/16] mirror: implement completion Paolo Bonzini
2012-10-18 14:49 ` [Qemu-devel] [PATCH v3 12/16] qemu-iotests: add mirroring test case Paolo Bonzini
2012-10-19 16:19   ` Kevin Wolf [this message]
2012-10-20 13:47     ` Paolo Bonzini
2012-10-22  8:44       ` Kevin Wolf
2012-10-22 15:38         ` Paolo Bonzini
2012-10-23 14:39         ` [Qemu-devel] [PATCH v4 " Paolo Bonzini
2012-10-23 14:39         ` [Qemu-devel] [PATCH v4 16/16] qemu-iotests: add testcases for mirroring on-source-error/on-target-error Paolo Bonzini
2012-10-19 17:24   ` [Qemu-devel] [PATCH v3 12/16] qemu-iotests: add mirroring test case Kevin Wolf
2012-10-18 14:49 ` [Qemu-devel] [PATCH v3 13/16] iostatus: forward block_job_iostatus_reset to block job Paolo Bonzini
2012-10-18 14:49 ` [Qemu-devel] [PATCH v3 14/16] mirror: add support for on-source-error/on-target-error Paolo Bonzini
2012-10-18 14:49 ` [Qemu-devel] [PATCH v3 15/16] qmp: add pull_event function Paolo Bonzini
2012-10-18 14:49 ` [Qemu-devel] [PATCH v3 16/16] qemu-iotests: add testcases for mirroring on-source-error/on-target-error Paolo Bonzini

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=50817D77.1080708@redhat.com \
    --to=kwolf@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /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).