[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 01/16] iotests/118: Test media change for scsi-cd
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 01/16] iotests/118: Test media change for scsi-cd |
Date: |
Fri, 16 Aug 2019 11:34:24 +0200 |
The test covered only floppy and ide-cd. Add scsi-cd as well.
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/118 | 20 ++++++++++++++++++++
tests/qemu-iotests/118.out | 4 ++--
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/tests/qemu-iotests/118 b/tests/qemu-iotests/118
index 499c5f0901..3c20d2d61f 100755
--- a/tests/qemu-iotests/118
+++ b/tests/qemu-iotests/118
@@ -33,6 +33,8 @@ def interface_to_device_name(interface):
return 'ide-cd'
elif interface == 'floppy':
return 'floppy'
+ elif interface == 'scsi':
+ return 'scsi-cd'
else:
return None
@@ -297,6 +299,8 @@ class TestInitiallyFilled(GeneralChangeTestsBaseClass):
qemu_img('create', '-f', iotests.imgfmt, new_img, '1440k')
self.vm = iotests.VM()
self.vm.add_drive(old_img, 'media=%s' % media, 'none')
+ if interface == 'scsi':
+ self.vm.add_device('virtio-scsi-pci')
self.vm.add_device('%s,drive=drive0,id=%s' %
(interface_to_device_name(interface),
self.device_name))
@@ -330,6 +334,8 @@ class TestInitiallyEmpty(GeneralChangeTestsBaseClass):
def setUp(self, media, interface):
qemu_img('create', '-f', iotests.imgfmt, new_img, '1440k')
self.vm = iotests.VM().add_drive(None, 'media=%s' % media, 'none')
+ if interface == 'scsi':
+ self.vm.add_device('virtio-scsi-pci')
self.vm.add_device('%s,drive=drive0,id=%s' %
(interface_to_device_name(interface),
self.device_name))
@@ -363,6 +369,20 @@ class TestCDInitiallyEmpty(TestInitiallyEmpty):
def setUp(self):
self.TestInitiallyEmpty.setUp(self, 'cdrom', 'ide')
+class TestSCSICDInitiallyFilled(TestInitiallyFilled):
+ TestInitiallyFilled = TestInitiallyFilled
+ has_real_tray = True
+
+ def setUp(self):
+ self.TestInitiallyFilled.setUp(self, 'cdrom', 'scsi')
+
+class TestSCSICDInitiallyEmpty(TestInitiallyEmpty):
+ TestInitiallyEmpty = TestInitiallyEmpty
+ has_real_tray = True
+
+ def setUp(self):
+ self.TestInitiallyEmpty.setUp(self, 'cdrom', 'scsi')
+
class TestFloppyInitiallyFilled(TestInitiallyFilled):
TestInitiallyFilled = TestInitiallyFilled
has_real_tray = False
diff --git a/tests/qemu-iotests/118.out b/tests/qemu-iotests/118.out
index 4823c113d5..b4ff997a8c 100644
--- a/tests/qemu-iotests/118.out
+++ b/tests/qemu-iotests/118.out
@@ -1,5 +1,5 @@
-...............................................................
+.........................................................................................
----------------------------------------------------------------------
-Ran 63 tests
+Ran 89 tests
OK
--
2.20.1
- [Qemu-block] [PULL 00/16] Block layer patches, Kevin Wolf, 2019/08/16
- [Qemu-block] [PULL 02/16] iotests/118: Create test classes dynamically, Kevin Wolf, 2019/08/16
- [Qemu-block] [PULL 01/16] iotests/118: Test media change for scsi-cd,
Kevin Wolf <=
- [Qemu-block] [PULL 03/16] iotests/118: Add -blockdev based tests, Kevin Wolf, 2019/08/16
- [Qemu-block] [PULL 04/16] iotests: Move migration helpers to iotests.py, Kevin Wolf, 2019/08/16
- [Qemu-block] [PULL 06/16] block: Simplify bdrv_filter_default_perms(), Kevin Wolf, 2019/08/16
- [Qemu-block] [PULL 07/16] block: Keep subtree drained in drop_intermediate, Kevin Wolf, 2019/08/16
- [Qemu-block] [PULL 05/16] iotests: Test migration with all kinds of filter nodes, Kevin Wolf, 2019/08/16
- [Qemu-block] [PULL 08/16] block: Reduce (un)drains when replacing a child, Kevin Wolf, 2019/08/16
- [Qemu-block] [PULL 09/16] tests: Test polling in bdrv_drop_intermediate(), Kevin Wolf, 2019/08/16
- [Qemu-block] [PULL 10/16] tests: Test mid-drain bdrv_replace_child_noperm(), Kevin Wolf, 2019/08/16
- [Qemu-block] [PULL 11/16] iotests: Add test for concurrent stream/commit, Kevin Wolf, 2019/08/16
- [Qemu-block] [PULL 12/16] block: Remove blk_pread_unthrottled(), Kevin Wolf, 2019/08/16