iotests/118: Test media change for scsi-cd
The test covered only floppy and ide-cd. Add scsi-cd as well. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
parent
9e06029aea
commit
dfa26a110c
|
@ -33,6 +33,8 @@ def interface_to_device_name(interface):
|
||||||
return 'ide-cd'
|
return 'ide-cd'
|
||||||
elif interface == 'floppy':
|
elif interface == 'floppy':
|
||||||
return 'floppy'
|
return 'floppy'
|
||||||
|
elif interface == 'scsi':
|
||||||
|
return 'scsi-cd'
|
||||||
else:
|
else:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
@ -297,6 +299,8 @@ class TestInitiallyFilled(GeneralChangeTestsBaseClass):
|
||||||
qemu_img('create', '-f', iotests.imgfmt, new_img, '1440k')
|
qemu_img('create', '-f', iotests.imgfmt, new_img, '1440k')
|
||||||
self.vm = iotests.VM()
|
self.vm = iotests.VM()
|
||||||
self.vm.add_drive(old_img, 'media=%s' % media, 'none')
|
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' %
|
self.vm.add_device('%s,drive=drive0,id=%s' %
|
||||||
(interface_to_device_name(interface),
|
(interface_to_device_name(interface),
|
||||||
self.device_name))
|
self.device_name))
|
||||||
|
@ -330,6 +334,8 @@ class TestInitiallyEmpty(GeneralChangeTestsBaseClass):
|
||||||
def setUp(self, media, interface):
|
def setUp(self, media, interface):
|
||||||
qemu_img('create', '-f', iotests.imgfmt, new_img, '1440k')
|
qemu_img('create', '-f', iotests.imgfmt, new_img, '1440k')
|
||||||
self.vm = iotests.VM().add_drive(None, 'media=%s' % media, 'none')
|
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' %
|
self.vm.add_device('%s,drive=drive0,id=%s' %
|
||||||
(interface_to_device_name(interface),
|
(interface_to_device_name(interface),
|
||||||
self.device_name))
|
self.device_name))
|
||||||
|
@ -363,6 +369,20 @@ class TestCDInitiallyEmpty(TestInitiallyEmpty):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
self.TestInitiallyEmpty.setUp(self, 'cdrom', 'ide')
|
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):
|
class TestFloppyInitiallyFilled(TestInitiallyFilled):
|
||||||
TestInitiallyFilled = TestInitiallyFilled
|
TestInitiallyFilled = TestInitiallyFilled
|
||||||
has_real_tray = False
|
has_real_tray = False
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
...............................................................
|
.........................................................................................
|
||||||
----------------------------------------------------------------------
|
----------------------------------------------------------------------
|
||||||
Ran 63 tests
|
Ran 89 tests
|
||||||
|
|
||||||
OK
|
OK
|
||||||
|
|
Loading…
Reference in a new issue