[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/16] iotests/118: Add -blockdev based tests
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 03/16] iotests/118: Add -blockdev based tests |
Date: |
Fri, 16 Aug 2019 11:34:26 +0200 |
The code path for -device drive=<node-name> or without a drive=...
option for empty drives, which is supposed to be used with -blockdev
differs enough from the -drive based path with a user-owned
BlockBackend, so we want to test both paths at least for the basic tests
implemented by TestInitiallyFilled and TestInitiallyEmpty.
This would have caught the bug recently fixed for inserting read-only
nodes into a scsi-cd created without a drive=... option.
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/118 | 43 ++++++++++++++++++++++++++------------
tests/qemu-iotests/118.out | 4 ++--
2 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/tests/qemu-iotests/118 b/tests/qemu-iotests/118
index c281259215..6f45779ee9 100755
--- a/tests/qemu-iotests/118
+++ b/tests/qemu-iotests/118
@@ -42,10 +42,14 @@ class ChangeBaseClass(iotests.QMPTestCase):
has_opened = False
has_closed = False
+ device_name = 'qdev0'
+ use_drive = False
+
def process_events(self):
for event in self.vm.get_qmp_events(wait=False):
if (event['event'] == 'DEVICE_TRAY_MOVED' and
- event['data']['device'] == 'drive0'):
+ (event['data']['device'] == 'drive0' or
+ event['data']['id'] == self.device_name)):
if event['data']['tray-open'] == False:
self.has_closed = True
else:
@@ -69,9 +73,11 @@ class ChangeBaseClass(iotests.QMPTestCase):
class GeneralChangeTestsBaseClass(ChangeBaseClass):
- device_name = 'qdev0'
-
def test_change(self):
+ # 'change' requires a drive name, so skip the test for blockdev
+ if not self.use_drive:
+ return
+
result = self.vm.qmp('change', device='drive0', target=new_img,
arg=iotests.imgfmt)
self.assert_qmp(result, 'return', {})
@@ -298,7 +304,13 @@ class TestInitiallyFilled(GeneralChangeTestsBaseClass):
qemu_img('create', '-f', iotests.imgfmt, old_img, '1440k')
qemu_img('create', '-f', iotests.imgfmt, new_img, '1440k')
self.vm = iotests.VM()
- self.vm.add_drive(old_img, 'media=%s' % self.media, 'none')
+ if self.use_drive:
+ self.vm.add_drive(old_img, 'media=%s' % self.media, 'none')
+ else:
+ self.vm.add_blockdev([ 'node-name=drive0',
+ 'driver=%s' % iotests.imgfmt,
+ 'file.driver=file',
+ 'file.filename=%s' % old_img ])
if self.interface == 'scsi':
self.vm.add_device('virtio-scsi-pci')
self.vm.add_device('%s,drive=drive0,id=%s' %
@@ -333,11 +345,14 @@ class TestInitiallyEmpty(GeneralChangeTestsBaseClass):
def setUp(self):
qemu_img('create', '-f', iotests.imgfmt, new_img, '1440k')
- self.vm = iotests.VM().add_drive(None, 'media=%s' % self.media, 'none')
+ self.vm = iotests.VM()
+ if self.use_drive:
+ self.vm.add_drive(None, 'media=%s' % self.media, 'none')
if self.interface == 'scsi':
self.vm.add_device('virtio-scsi-pci')
- self.vm.add_device('%s,drive=drive0,id=%s' %
+ self.vm.add_device('%s,%sid=%s' %
(interface_to_device_name(self.interface),
+ 'drive=drive0,' if self.use_drive else '',
self.device_name))
self.vm.launch()
@@ -363,13 +378,15 @@ def create_basic_test_classes():
('disk', 'floppy', False) ]:
for case in [ TestInitiallyFilled, TestInitiallyEmpty ]:
-
- attr = { 'media': media,
- 'interface': interface,
- 'has_real_tray': has_real_tray }
-
- name = '%s_%s_%s' % (case.__name__, media, interface)
- globals()[name] = type(name, (case, ), attr)
+ for use_drive in [ True, False ]:
+ attr = { 'media': media,
+ 'interface': interface,
+ 'has_real_tray': has_real_tray,
+ 'use_drive': use_drive }
+
+ name = '%s_%s_%s_%s' % (case.__name__, media, interface,
+ 'drive' if use_drive else 'blockdev')
+ globals()[name] = type(name, (case, ), attr)
create_basic_test_classes()
diff --git a/tests/qemu-iotests/118.out b/tests/qemu-iotests/118.out
index b4ff997a8c..bf5bfd5aca 100644
--- a/tests/qemu-iotests/118.out
+++ b/tests/qemu-iotests/118.out
@@ -1,5 +1,5 @@
-.........................................................................................
+.......................................................................................................................................................................
----------------------------------------------------------------------
-Ran 89 tests
+Ran 167 tests
OK
--
2.20.1
- [Qemu-devel] [PULL 00/16] Block layer patches, Kevin Wolf, 2019/08/16
- [Qemu-devel] [PULL 01/16] iotests/118: Test media change for scsi-cd, Kevin Wolf, 2019/08/16
- [Qemu-devel] [PULL 02/16] iotests/118: Create test classes dynamically, Kevin Wolf, 2019/08/16
- [Qemu-devel] [PULL 04/16] iotests: Move migration helpers to iotests.py, Kevin Wolf, 2019/08/16
- [Qemu-devel] [PULL 03/16] iotests/118: Add -blockdev based tests,
Kevin Wolf <=
- [Qemu-devel] [PULL 06/16] block: Simplify bdrv_filter_default_perms(), Kevin Wolf, 2019/08/16
- [Qemu-devel] [PULL 08/16] block: Reduce (un)drains when replacing a child, Kevin Wolf, 2019/08/16
- [Qemu-devel] [PULL 07/16] block: Keep subtree drained in drop_intermediate, Kevin Wolf, 2019/08/16
- [Qemu-devel] [PULL 05/16] iotests: Test migration with all kinds of filter nodes, Kevin Wolf, 2019/08/16
- [Qemu-devel] [PULL 09/16] tests: Test polling in bdrv_drop_intermediate(), Kevin Wolf, 2019/08/16
- [Qemu-devel] [PULL 10/16] tests: Test mid-drain bdrv_replace_child_noperm(), Kevin Wolf, 2019/08/16
- [Qemu-devel] [PULL 12/16] block: Remove blk_pread_unthrottled(), Kevin Wolf, 2019/08/16
- [Qemu-devel] [PULL 11/16] iotests: Add test for concurrent stream/commit, Kevin Wolf, 2019/08/16
- [Qemu-devel] [PULL 13/16] mirror: Keep mirror_top_bs drained after dropping permissions, Kevin Wolf, 2019/08/16
- [Qemu-devel] [PULL 15/16] qemu-img convert: Deprecate using -n and -o together, Kevin Wolf, 2019/08/16