openstack/nova
Code Issues Proposed changes

tests: fix uefi testcases

Browse Source 
As commit 5de6b7eb dropped MIN_LIBVIRT_UEFI_VERSION, it is
no longer necessary to path has_min_version for checking if
uefi is supported. We drop test_has_uefi_support_with_invalid_versiontestcase
as now it does nothing and simply false fails.
Other test cases are fixed as the previous way for setting host
architecture via capabilities didn't take any effect. We should
use for this purpose _stub_host_capabilities_cpu_arch.

Change-Id: I2dfc103dc9bc46de3e65fc03a7abdd2eee10b822
This commit is contained in:
Maxim Nestratov
2017-03-23 15:13:18 +03:00
parent 1e0e4080fb
commit d6bc773643
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
nova/tests/unit/virt/libvirt/test_driver.py
View File

@@ -3234,18 +3234,9 @@ class LibvirtConnTestCase(test.NoDBTestCase):
self.assertIsInstance(cfg.devices[2],
vconfig.LibvirtConfigGuestConsole)
def test_has_uefi_support_with_invalid_version(self):
drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)
with mock.patch.object(drvr._host,
'has_min_version', return_value=False):
self.assertFalse(drvr._has_uefi_support())
def test_has_uefi_support_not_supported_arch(self):
drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)
caps = vconfig.LibvirtConfigCaps()
caps.host = vconfig.LibvirtConfigCapsHost()
caps.host.cpu = vconfig.LibvirtConfigCPU()
caps.host.cpu.arch = "alpha"
self._stub_host_capabilities_cpu_arch(fields.Architecture.ALPHA)
self.assertFalse(drvr._has_uefi_support())
@mock.patch('os.path.exists', return_value=False)
@@ -3257,10 +3248,7 @@ class LibvirtConnTestCase(test.NoDBTestCase):
def test_has_uefi_support(self, mock_has_version):
drvr = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)
caps = vconfig.LibvirtConfigCaps()
caps.host = vconfig.LibvirtConfigCapsHost()
caps.host.cpu = vconfig.LibvirtConfigCPU()
caps.host.cpu.arch = fields.Architecture.X86_64
self._stub_host_capabilities_cpu_arch(fields.Architecture.X86_64)
with mock.patch.object(drvr._host,
'has_min_version', return_value=True):