All of lore.kernel.org
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: anthony@codemonkey.ws
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 21/27] test: add image streaming tests
Date: Wed, 29 Feb 2012 16:18:02 +0100	[thread overview]
Message-ID: <1330528688-21996-22-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1330528688-21996-1-git-send-email-kwolf@redhat.com>

From: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>

This patch adds a test suite for the image streaming feature.  It
exercises the 'block_stream', 'block_job_cancel', 'block_job_set_speed',
and 'query-block-jobs' QMP commands.

Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/030     |  151 ++++++++++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/030.out |    5 ++
 tests/qemu-iotests/group   |    1 +
 3 files changed, 157 insertions(+), 0 deletions(-)
 create mode 100755 tests/qemu-iotests/030
 create mode 100644 tests/qemu-iotests/030.out

diff --git a/tests/qemu-iotests/030 b/tests/qemu-iotests/030
new file mode 100755
index 0000000..1faf984
--- /dev/null
+++ b/tests/qemu-iotests/030
@@ -0,0 +1,151 @@
+#!/usr/bin/env python
+#
+# Tests for image streaming.
+#
+# Copyright (C) 2012 IBM Corp.
+#
+# 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 os
+import iotests
+from iotests import qemu_img, qemu_io
+
+backing_img = os.path.join(iotests.test_dir, 'backing.img')
+test_img = os.path.join(iotests.test_dir, 'test.img')
+
+class ImageStreamingTestCase(iotests.QMPTestCase):
+    '''Abstract base class for image streaming test cases'''
+
+    def assert_no_active_streams(self):
+        result = self.vm.qmp('query-block-jobs')
+        self.assert_qmp(result, 'return', [])
+
+class TestSingleDrive(ImageStreamingTestCase):
+    image_len = 1 * 1024 * 1024 # MB
+
+    def setUp(self):
+        qemu_img('create', backing_img, str(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)
+
+    def test_stream(self):
+        self.assert_no_active_streams()
+
+        result = self.vm.qmp('block_stream', device='drive0')
+        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', 'stream')
+                    self.assert_qmp(event, 'data/device', 'drive0')
+                    self.assert_qmp(event, 'data/offset', self.image_len)
+                    self.assert_qmp(event, 'data/len', self.image_len)
+                    completed = True
+
+        self.assert_no_active_streams()
+
+        self.assertFalse('sectors not allocated' in qemu_io('-c', 'map', test_img),
+                         'image file not fully populated after streaming')
+
+    def test_device_not_found(self):
+        result = self.vm.qmp('block_stream', device='nonexistent')
+        self.assert_qmp(result, 'error/class', 'DeviceNotFound')
+
+class TestStreamStop(ImageStreamingTestCase):
+    image_len = 8 * 1024 * 1024 * 1024 # GB
+
+    def setUp(self):
+        qemu_img('create', backing_img, str(TestStreamStop.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)
+
+    def test_stream_stop(self):
+        import time
+
+        self.assert_no_active_streams()
+
+        result = self.vm.qmp('block_stream', device='drive0')
+        self.assert_qmp(result, 'return', {})
+
+        time.sleep(1)
+        events = self.vm.get_qmp_events(wait=False)
+        self.assertEqual(events, [], 'unexpected QMP event: %s' % events)
+
+        self.vm.qmp('block_job_cancel', device='drive0')
+        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_CANCELLED':
+                    self.assert_qmp(event, 'data/type', 'stream')
+                    self.assert_qmp(event, 'data/device', 'drive0')
+                    cancelled = True
+
+        self.assert_no_active_streams()
+
+# This is a short performance test which is not run by default.
+# Invoke "IMGFMT=qed ./030 TestSetSpeed.perf_test_set_speed"
+class TestSetSpeed(ImageStreamingTestCase):
+    image_len = 80 * 1024 * 1024 # MB
+
+    def setUp(self):
+        qemu_img('create', backing_img, str(TestSetSpeed.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)
+
+    def perf_test_set_speed(self):
+        self.assert_no_active_streams()
+
+        result = self.vm.qmp('block_stream', device='drive0')
+        self.assert_qmp(result, 'return', {})
+
+        result = self.vm.qmp('block_job_set_speed', device='drive0', value=8 * 1024 * 1024)
+        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', 'stream')
+                    self.assert_qmp(event, 'data/device', 'drive0')
+                    self.assert_qmp(event, 'data/offset', self.image_len)
+                    self.assert_qmp(event, 'data/len', self.image_len)
+                    completed = True
+
+        self.assert_no_active_streams()
+
+if __name__ == '__main__':
+    iotests.main(supported_fmts=['qcow2', 'qed'])
diff --git a/tests/qemu-iotests/030.out b/tests/qemu-iotests/030.out
new file mode 100644
index 0000000..8d7e996
--- /dev/null
+++ b/tests/qemu-iotests/030.out
@@ -0,0 +1,5 @@
+...
+----------------------------------------------------------------------
+Ran 3 tests
+
+OK
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index 0a5c866..fcf869d 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -36,3 +36,4 @@
 027 rw auto
 028 rw backing auto
 029 rw auto
+030 rw auto
-- 
1.7.6.5

  parent reply	other threads:[~2012-02-29 15:15 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-29 15:17 [Qemu-devel] [PULL 00/27] Block patches Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 01/27] fdc: take side count into account Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 02/27] fdc: set busy bit when starting a command Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 03/27] fdc: most control commands do not generate interrupts Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 04/27] fdc: handle read-only floppies (abort early on write commands) Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 05/27] fdc: add CCR (Configuration Control Register) write register Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 06/27] block: add a transfer rate for floppy types Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 07/27] fdc: add a 'check media rate' property. Not used yet Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 08/27] fdc: check if media rate is correct before doing any transfer Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 09/27] fdc: fix seek command, which shouldn't check tracks Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 10/27] fdc: DIR (Digital Input Register) should return status of current drive Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 11/27] ide: fail I/O to empty disk Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 12/27] qcow2: Fix build with DEBUG_EXT enabled Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 13/27] block: remove unused fields in BlockDriverState Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 14/27] block: drop aio_multiwrite in BlockDriver Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 15/27] qcow2: Fix offset in qcow2_read_extensions Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 16/27] qcow2: Reject too large header extensions Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 17/27] qapi: Introduce blockdev-group-snapshot-sync command Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 18/27] QMP: Add qmp command for blockdev-group-snapshot-sync Kevin Wolf
2012-02-29 15:18 ` [Qemu-devel] [PATCH 19/27] qemu-iotests: export TEST_DIR for non-bash tests Kevin Wolf
2012-02-29 15:18 ` [Qemu-devel] [PATCH 20/27] qemu-iotests: add iotests Python module Kevin Wolf
2012-02-29 15:18 ` Kevin Wolf [this message]
2012-02-29 15:18 ` [Qemu-devel] [PATCH 22/27] qemu-iotests: Filter out DOS line endings Kevin Wolf
2012-02-29 15:18 ` [Qemu-devel] [PATCH 23/27] qemu-iotests: 026: Reduce output changes for cache=none qcow2 Kevin Wolf
2012-02-29 15:18 ` [Qemu-devel] [PATCH 24/27] qemu-iotests: Test rebase with short backing file Kevin Wolf
2012-02-29 15:18 ` [Qemu-devel] [PATCH 25/27] qemu-tool: revert cpu_get_clock() abort(3) Kevin Wolf
2012-02-29 15:18 ` [Qemu-devel] [PATCH 26/27] qemu-io: fix segment fault when the image format is qed Kevin Wolf
2012-02-29 15:18 ` [Qemu-devel] [PATCH 27/27] qemu-img: " Kevin Wolf
2012-02-29 21:06 ` [Qemu-devel] [PULL 00/27] Block patches Anthony Liguori

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=1330528688-21996-22-git-send-email-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=anthony@codemonkey.ws \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.