From 58fbfdb9bf48fa18f2f7909b32d35340acd7e9dd Mon Sep 17 00:00:00 2001 From: Yongli he Date: Tue, 28 Oct 2014 10:04:10 +0800 Subject: resource tracker style pci resource management pci device resource should be managed via a method very like vcpu/mem. allocte device in the Claim, release them when fail or instance deleted. Change-Id: Ia17a9f6bbaec358d244d4492798869b0e0a6a8cc Closes-Bug: #1383465 --- nova/tests/unit/pci/test_stats.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'nova/tests/unit/pci/test_stats.py') diff --git a/nova/tests/unit/pci/test_stats.py b/nova/tests/unit/pci/test_stats.py index 8cdeb4be21..dc07a48170 100644 --- a/nova/tests/unit/pci/test_stats.py +++ b/nova/tests/unit/pci/test_stats.py @@ -159,9 +159,8 @@ class PciDeviceStatsTestCase(test.NoDBTestCase): self.assertEqual(0, len(devs)) def test_consume_requests_failed(self): - self.assertRaises(exception.PciDeviceRequestFailed, - self.pci_stats.consume_requests, - pci_requests_multiple) + self.assertIsNone(self.pci_stats.consume_requests( + pci_requests_multiple)) def test_support_requests_numa(self): cells = [objects.NUMACell(id=0, cpuset=set(), memory=0), @@ -191,9 +190,7 @@ class PciDeviceStatsTestCase(test.NoDBTestCase): def test_consume_requests_numa_failed(self): cells = [objects.NUMACell(id=0, cpuset=set(), memory=0)] - self.assertRaises(exception.PciDeviceRequestFailed, - self.pci_stats.consume_requests, - pci_requests, cells) + 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)] -- cgit v1.2.1