x/vmware-nsx
Code Issues Proposed changes

Merge "Avoid creating FixedIntervalLoopingCall in agent UT"

Browse Source
This commit is contained in:
Jenkins 2014-03-22 02:15:42 +00:00 committed by Gerrit Code Review
commit 964d2c3d47
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
View File

@ -96,6 +96,8 @@ class TestLinuxBridgeAgent(base.BaseTestCase):
def setUp(self): def setUp(self):
super(TestLinuxBridgeAgent, self).setUp() super(TestLinuxBridgeAgent, self).setUp()
# disable setting up periodic state reporting
cfg.CONF.set_override('report_interval', 0, 'AGENT')
cfg.CONF.set_override('rpc_backend', cfg.CONF.set_override('rpc_backend',
'neutron.openstack.common.rpc.impl_fake') 'neutron.openstack.common.rpc.impl_fake')
self.execute_p = mock.patch.object(ip_lib.IPWrapper, '_execute') self.execute_p = mock.patch.object(ip_lib.IPWrapper, '_execute')

3
neutron/tests/unit/services/loadbalancer/agent/test_agent_manager.py
View File

@ -38,6 +38,9 @@ class TestManager(base.BaseTestCase):
'neutron.services.loadbalancer.agent.agent_api.LbaasAgentApi' 'neutron.services.loadbalancer.agent.agent_api.LbaasAgentApi'
).start() ).start()
# disable setting up periodic state reporting
mock_conf.AGENT.report_interval = 0
self.mgr = manager.LbaasAgentManager(mock_conf) self.mgr = manager.LbaasAgentManager(mock_conf)
self.rpc_mock = rpc_mock_cls.return_value self.rpc_mock = rpc_mock_cls.return_value
self.log = mock.patch.object(manager, 'LOG').start() self.log = mock.patch.object(manager, 'LOG').start()

5
neutron/tests/unit/test_dhcp_agent.py
View File

@ -132,6 +132,9 @@ class TestDhcpAgent(base.BaseTestCase):
dhcp_agent.register_options() dhcp_agent.register_options()
cfg.CONF.set_override('interface_driver', cfg.CONF.set_override('interface_driver',
'neutron.agent.linux.interface.NullDriver') 'neutron.agent.linux.interface.NullDriver')
# disable setting up periodic state reporting
cfg.CONF.set_override('report_interval', 0, 'AGENT')
self.driver_cls_p = mock.patch( self.driver_cls_p = mock.patch(
'neutron.agent.dhcp_agent.importutils.import_class') 'neutron.agent.dhcp_agent.importutils.import_class')
self.driver = mock.Mock(name='driver') self.driver = mock.Mock(name='driver')
@ -143,6 +146,8 @@ class TestDhcpAgent(base.BaseTestCase):
def test_dhcp_agent_manager(self): def test_dhcp_agent_manager(self):
state_rpc_str = 'neutron.agent.rpc.PluginReportStateAPI' state_rpc_str = 'neutron.agent.rpc.PluginReportStateAPI'
# sync_state is needed for this test
cfg.CONF.set_override('report_interval', 1, 'AGENT')
with mock.patch.object(DhcpAgentWithStateReport, with mock.patch.object(DhcpAgentWithStateReport,
'sync_state', 'sync_state',
autospec=True) as mock_sync_state: autospec=True) as mock_sync_state: