Merge "Added cpu_info report to HyperV Compute driver"

This commit is contained in:
Jenkins 2012-11-26 15:26:43 +00:00 committed by Gerrit Code Review
commit f31beaf2c8
6 changed files with 3 additions and 2 deletions

View File

@ -76,7 +76,7 @@ class HyperVAPITestCase(basetestcase.BaseTestCase):
fake_image.stub_out_image_service(self.stubs) fake_image.stub_out_image_service(self.stubs)
fake_network.stub_out_nw_api_get_instance_nw_info(self.stubs) fake_network.stub_out_nw_api_get_instance_nw_info(self.stubs)
def fake_dumps(msg): def fake_dumps(msg, default=None, **kwargs):
return '""' return '""'
self.stubs.Set(json, 'dumps', fake_dumps) self.stubs.Set(json, 'dumps', fake_dumps)
@ -108,7 +108,8 @@ class HyperVAPITestCase(basetestcase.BaseTestCase):
'multiprocessing', 'multiprocessing',
'_winreg', '_winreg',
'nova.virt.configdrive', 'nova.virt.configdrive',
'nova.utils' 'nova.utils',
'ctypes'
] ]
# Modules in which the mocks are going to be injected # Modules in which the mocks are going to be injected