Merge "Avoid executing ipmitool in IPMI unit test"
This commit is contained in:
commit
ac8d3acbfb
@ -44,9 +44,8 @@ class TestPollsterBase(base.BaseTestCase):
|
||||
nm.read_temperature_all.side_effect = self.fake_data
|
||||
nm.read_power_all.side_effect = self.fake_data
|
||||
nm.read_sensor_any.side_effect = self.fake_sensor_data
|
||||
|
||||
self.mgr = manager.AgentManager()
|
||||
|
||||
# We should mock the pollster first before initialize the Manager
|
||||
# so that we don't trigger the sudo in pollsters' __init__().
|
||||
self.useFixture(mockpatch.Patch(
|
||||
'ceilometer.ipmi.platform.intel_node_manager.NodeManager',
|
||||
return_value=nm))
|
||||
@ -55,6 +54,8 @@ class TestPollsterBase(base.BaseTestCase):
|
||||
'ceilometer.ipmi.platform.ipmi_sensor.IPMISensor',
|
||||
return_value=nm))
|
||||
|
||||
self.mgr = manager.AgentManager()
|
||||
|
||||
self.pollster = self.make_pollster()
|
||||
|
||||
def _verify_metering(self, length, expected_vol=None, node=None):
|
||||
|
@ -27,6 +27,10 @@ from ceilometer.tests.agent import agentbase
|
||||
class TestManager(base.BaseTestCase):
|
||||
|
||||
@mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock())
|
||||
@mock.patch('ceilometer.ipmi.pollsters.node._Base.__init__',
|
||||
mock.Mock(return_value=None))
|
||||
@mock.patch('ceilometer.ipmi.pollsters.sensor.SensorPollster.__init__',
|
||||
mock.Mock(return_value=None))
|
||||
def test_load_plugins(self):
|
||||
mgr = manager.AgentManager()
|
||||
self.assertIsNotNone(list(mgr.extensions))
|
||||
@ -35,6 +39,10 @@ class TestManager(base.BaseTestCase):
|
||||
class TestRunTasks(agentbase.BaseAgentManagerTestCase):
|
||||
|
||||
@staticmethod
|
||||
@mock.patch('ceilometer.ipmi.pollsters.node._Base.__init__',
|
||||
mock.Mock(return_value=None))
|
||||
@mock.patch('ceilometer.ipmi.pollsters.sensor.SensorPollster.__init__',
|
||||
mock.Mock(return_value=None))
|
||||
def create_manager():
|
||||
return manager.AgentManager()
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user