openstack
/
nova
Code Issues Proposed changes

Changed NUMACell to InstanceNUMACell in test_stats.py 

Tested methods consume_requests() and consume_requests() operate
with InstanceNUMACell objects but because of mistake NUMACell
objects were used instead. It may cause the problem if these
methods will try to use some field which is not a field of NUMACell
but is a field of InstanceNUMACell.

Also some indents were removed from assertTrue/False

Change-Id: Ib41c9b22bfd22e769fac729f09d95d6bc8ba8e6b
This commit is contained in:
Sergey Nikitin 2016-10-25 17:42:37 +03:00
parent 90f01d5ebb
commit 9d2ce8f1fe
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
nova/tests/unit/pci/test_stats.py
View File

@ -169,37 +169,34 @@ class PciDeviceStatsTestCase(test.NoDBTestCase):
pci_requests_multiple))
def test_support_requests_numa(self):
cells = [objects.NUMACell(id=0, cpuset=set(), memory=0),
objects.NUMACell(id=1, cpuset=set(), memory=0)]
self.assertTrue(self.pci_stats.support_requests(
pci_requests, cells))
cells = [objects.InstanceNUMACell(id=0, cpuset=set(), memory=0),
objects.InstanceNUMACell(id=1, cpuset=set(), memory=0)]
self.assertTrue(self.pci_stats.support_requests(pci_requests, cells))
def test_support_requests_numa_failed(self):
cells = [objects.NUMACell(id=0, cpuset=set(), memory=0)]
self.assertFalse(self.pci_stats.support_requests(
pci_requests, cells))
cells = [objects.InstanceNUMACell(id=0, cpuset=set(), memory=0)]
self.assertFalse(self.pci_stats.support_requests(pci_requests, cells))
def test_support_requests_no_numa_info(self):
cells = [objects.NUMACell(id=0, cpuset=set(), memory=0)]
cells = [objects.InstanceNUMACell(id=0, cpuset=set(), memory=0)]
pci_request = [objects.InstancePCIRequest(count=1,
spec=[{'vendor_id': 'v3'}])]
self.assertTrue(self.pci_stats.support_requests(
pci_request, cells))
self.assertTrue(self.pci_stats.support_requests(pci_request, cells))
def test_consume_requests_numa(self):
cells = [objects.NUMACell(id=0, cpuset=set(), memory=0),
objects.NUMACell(id=1, cpuset=set(), memory=0)]
cells = [objects.InstanceNUMACell(id=0, cpuset=set(), memory=0),
objects.InstanceNUMACell(id=1, cpuset=set(), memory=0)]
devs = self.pci_stats.consume_requests(pci_requests, cells)
self.assertEqual(2, len(devs))
self.assertEqual(set(['v1', 'v2']),
set([dev.vendor_id for dev in devs]))
def test_consume_requests_numa_failed(self):
cells = [objects.NUMACell(id=0, cpuset=set(), memory=0)]
cells = [objects.InstanceNUMACell(id=0, cpuset=set(), memory=0)]
self.assertIsNone(self.pci_stats.consume_requests(pci_requests, cells))
def test_consume_requests_no_numa_info(self):
cells = [objects.NUMACell(id=0, cpuset=set(), memory=0)]
cells = [objects.InstanceNUMACell(id=0, cpuset=set(), memory=0)]
pci_request = [objects.InstancePCIRequest(count=1,
spec=[{'vendor_id': 'v3'}])]
devs = self.pci_stats.consume_requests(pci_request, cells)