From: Kevin Wolf <kwolf@redhat.com>
To: anthony@codemonkey.ws
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 19/43] tests: Add tests for fdsets
Date: Thu, 13 Dec 2012 16:10:26 +0100 [thread overview]
Message-ID: <1355411450-12761-20-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1355411450-12761-1-git-send-email-kwolf@redhat.com>
From: Corey Bryant <coreyb@linux.vnet.ibm.com>
Signed-off-by: Corey Bryant <coreyb@linux.vnet.ibm.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
tests/qemu-iotests/045 | 129 +++++++++++++++++++++++++++++++++++++++++
tests/qemu-iotests/045.out | 5 ++
tests/qemu-iotests/group | 1 +
tests/qemu-iotests/iotests.py | 12 ++++
4 files changed, 147 insertions(+), 0 deletions(-)
create mode 100755 tests/qemu-iotests/045
create mode 100644 tests/qemu-iotests/045.out
diff --git a/tests/qemu-iotests/045 b/tests/qemu-iotests/045
new file mode 100755
index 0000000..2b6f1af
--- /dev/null
+++ b/tests/qemu-iotests/045
@@ -0,0 +1,129 @@
+#!/usr/bin/env python
+#
+# Tests for fdsets.
+#
+# 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
+
+image0 = os.path.join(iotests.test_dir, 'image0')
+image1 = os.path.join(iotests.test_dir, 'image1')
+image2 = os.path.join(iotests.test_dir, 'image2')
+image3 = os.path.join(iotests.test_dir, 'image3')
+image4 = os.path.join(iotests.test_dir, 'image4')
+
+class TestFdSets(iotests.QMPTestCase):
+
+ def setUp(self):
+ self.vm = iotests.VM()
+ qemu_img('create', '-f', iotests.imgfmt, image0, '128K')
+ qemu_img('create', '-f', iotests.imgfmt, image1, '128K')
+ qemu_img('create', '-f', iotests.imgfmt, image2, '128K')
+ qemu_img('create', '-f', iotests.imgfmt, image3, '128K')
+ qemu_img('create', '-f', iotests.imgfmt, image4, '128K')
+ self.file0 = open(image0, 'r')
+ self.file1 = open(image1, 'w+')
+ self.file2 = open(image2, 'r')
+ self.file3 = open(image3, 'r')
+ self.file4 = open(image4, 'r')
+ self.vm.add_fd(self.file0.fileno(), 1, 'image0:r')
+ self.vm.add_fd(self.file1.fileno(), 1, 'image1:w+')
+ self.vm.add_fd(self.file2.fileno(), 0, 'image2:r')
+ self.vm.add_fd(self.file3.fileno(), 2, 'image3:r')
+ self.vm.add_fd(self.file4.fileno(), 2, 'image4:r')
+ self.vm.add_drive("/dev/fdset/1")
+ self.vm.launch()
+
+ def tearDown(self):
+ self.vm.shutdown()
+ self.file0.close()
+ self.file1.close()
+ self.file2.close()
+ self.file3.close()
+ self.file4.close()
+ os.remove(image0)
+ os.remove(image1)
+ os.remove(image2)
+ os.remove(image3)
+ os.remove(image4)
+
+ def test_query_fdset(self):
+ result = self.vm.qmp('query-fdsets')
+ self.assert_qmp(result, 'return[0]/fdset-id', 2)
+ self.assert_qmp(result, 'return[1]/fdset-id', 1)
+ self.assert_qmp(result, 'return[2]/fdset-id', 0)
+ self.assert_qmp(result, 'return[0]/fds[0]/opaque', 'image3:r')
+ self.assert_qmp(result, 'return[0]/fds[1]/opaque', 'image4:r')
+ self.assert_qmp(result, 'return[1]/fds[0]/opaque', 'image0:r')
+ self.assert_qmp(result, 'return[1]/fds[1]/opaque', 'image1:w+')
+ self.assert_qmp(result, 'return[2]/fds[0]/opaque', 'image2:r')
+ self.vm.shutdown()
+
+ def test_remove_fdset(self):
+ result = self.vm.qmp('remove-fd', fdset_id=2)
+ self.assert_qmp(result, 'return', {})
+ result = self.vm.qmp('query-fdsets')
+ self.assert_qmp(result, 'return[0]/fdset-id', 1)
+ self.assert_qmp(result, 'return[1]/fdset-id', 0)
+ self.assert_qmp(result, 'return[0]/fds[0]/opaque', 'image0:r')
+ self.assert_qmp(result, 'return[0]/fds[1]/opaque', 'image1:w+')
+ self.assert_qmp(result, 'return[1]/fds[0]/opaque', 'image2:r')
+ self.vm.shutdown()
+
+ def test_remove_fd(self):
+ result = self.vm.qmp('query-fdsets')
+ fd_image3 = result['return'][0]['fds'][0]['fd']
+ result = self.vm.qmp('remove-fd', fdset_id=2, fd=fd_image3)
+ self.assert_qmp(result, 'return', {})
+ result = self.vm.qmp('query-fdsets')
+ self.assert_qmp(result, 'return[0]/fdset-id', 2)
+ self.assert_qmp(result, 'return[1]/fdset-id', 1)
+ self.assert_qmp(result, 'return[2]/fdset-id', 0)
+ self.assert_qmp(result, 'return[0]/fds[0]/opaque', 'image4:r')
+ self.assert_qmp(result, 'return[1]/fds[0]/opaque', 'image0:r')
+ self.assert_qmp(result, 'return[1]/fds[1]/opaque', 'image1:w+')
+ self.assert_qmp(result, 'return[2]/fds[0]/opaque', 'image2:r')
+ self.vm.shutdown()
+
+ def test_remove_fd_invalid_fdset(self):
+ result = self.vm.qmp('query-fdsets')
+ fd_image3 = result['return'][0]['fds'][0]['fd']
+ result = self.vm.qmp('remove-fd', fdset_id=3, fd=fd_image3)
+ self.assert_qmp(result, 'error/class', 'GenericError')
+ self.assert_qmp(result, 'error/desc',
+ 'File descriptor named \'fdset-id:3, fd:%d\' not found' % fd_image3)
+ self.vm.shutdown()
+
+ def test_remove_fd_invalid_fd(self):
+ result = self.vm.qmp('query-fdsets')
+ result = self.vm.qmp('remove-fd', fdset_id=2, fd=999)
+ self.assert_qmp(result, 'error/class', 'GenericError')
+ self.assert_qmp(result, 'error/desc',
+ 'File descriptor named \'fdset-id:2, fd:999\' not found')
+ self.vm.shutdown()
+
+ def test_add_fd_invalid_fd(self):
+ result = self.vm.qmp('add-fd', fdset_id=2)
+ self.assert_qmp(result, 'error/class', 'GenericError')
+ self.assert_qmp(result, 'error/desc',
+ 'No file descriptor supplied via SCM_RIGHTS')
+ self.vm.shutdown()
+
+if __name__ == '__main__':
+ iotests.main(supported_fmts=['raw'])
diff --git a/tests/qemu-iotests/045.out b/tests/qemu-iotests/045.out
new file mode 100644
index 0000000..3f8a935
--- /dev/null
+++ b/tests/qemu-iotests/045.out
@@ -0,0 +1,5 @@
+......
+----------------------------------------------------------------------
+Ran 6 tests
+
+OK
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index a4a9044..5b39785 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -51,3 +51,4 @@
042 rw auto quick
043 rw auto backing
044 rw auto
+045 rw auto
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 0be5c7e..569ca3d 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -79,6 +79,18 @@ class VM(object):
self._num_drives += 1
return self
+ def add_fd(self, fd, fdset, opaque, opts=''):
+ '''Pass a file descriptor to the VM'''
+ options = ['fd=%d' % fd,
+ 'set=%d' % fdset,
+ 'opaque=%s' % opaque]
+ if opts:
+ options.append(opts)
+
+ self._args.append('-add-fd')
+ self._args.append(','.join(options))
+ return self
+
def launch(self):
'''Launch the VM and establish a QMP connection'''
devnull = open('/dev/null', 'rb')
--
1.7.6.5
next prev parent reply other threads:[~2012-12-13 16:04 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-13 15:10 [Qemu-devel] [PULL 00/43] Block patches Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 01/43] tests: use aio_poll() instead of aio_flush() in test-aio.c Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 02/43] tests: avoid qemu_aio_flush() in test-thread-pool.c Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 03/43] block: Improve bdrv_aio_co_cancel_em Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 04/43] aio: Get rid of qemu_aio_flush() Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 05/43] block: Factor out bdrv_open_flags Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 06/43] block: Avoid second open for format probing Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 07/43] virtio-blk: Remove duplicate property definition Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 08/43] block: vpc initialize the uuid footer field Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 09/43] block: vpc support for ~2 TB disks Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 10/43] raw-posix: inline paio_ioctl into hdev_aio_ioctl Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 11/43] Support default block interfaces per QEMUMachine Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 12/43] block: simplify default_drive Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 13/43] block: bdrv_img_create(): add Error ** argument Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 14/43] qemu-img: img_create(): pass Error object to bdrv_img_create() Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 15/43] qemu-img: img_create(): drop unneeded goto and ret variable Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 16/43] qmp: qmp_transaction(): pass Error object to bdrv_img_create() Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 17/43] qmp: qmp_drive_mirror(): " Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 18/43] block: bdrv_img_create(): drop unused error handling code Kevin Wolf
2012-12-13 15:10 ` Kevin Wolf [this message]
2012-12-13 15:10 ` [Qemu-devel] [PATCH 20/43] qemu-io: Implement write -c for compressed clusters Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 21/43] rbd: Fix race between aio completition and aio cancel Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 22/43] Fix error code checking for SetFilePointer() call Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 23/43] qemu-option: opt_set(): split it up into more functions Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 24/43] qemu-option: qemu_opts_validate(): fix duplicated code Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 25/43] qemu-option: qemu_opt_set_bool(): fix code duplication Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 26/43] introduce qemu_opts_create_nofail function Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 27/43] use qemu_opts_create_nofail Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 28/43] create new function: qemu_opt_set_number Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 29/43] blkdebug: Allow usage without config file Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 30/43] blkdebug: Factor out remove_rule() Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 31/43] blkdebug: Implement suspend/resume of AIO requests Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 32/43] qemu-io: Add AIO debugging commands Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 33/43] qcow2: Move BLKDBG_EVENT out of the lock Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 34/43] qemu-iotests: Test concurrent cluster allocations Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 35/43] atapi: reset cdrom tray statuses on ide_reset Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 36/43] qcow2: Round QCowL2Meta.offset down to cluster boundary Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 37/43] qcow2: Introduce Qcow2COWRegion Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 38/43] qcow2: Allocate l2meta dynamically Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 39/43] qcow2: Drop l2meta.cluster_offset Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 40/43] qcow2: Allocate l2meta only for cluster allocations Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 41/43] qcow2: Enable dirty flag in qcow2_alloc_cluster_link_l2 Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 42/43] qcow2: Execute run_dependent_requests() without lock Kevin Wolf
2012-12-13 15:10 ` [Qemu-devel] [PATCH 43/43] qcow2: Factor out handle_dependencies() Kevin Wolf
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=1355411450-12761-20-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 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).