From 712923d3ab3dd4b0b133a11735fed1533db84995 Mon Sep 17 00:00:00 2001 From: Eugene Nikanorov Date: Tue, 11 Mar 2014 16:04:49 +0400 Subject: [PATCH] Avoid creating FixedIntervalLoopingCall in agent UT Set polling_interval to 0 to avoid creating LoopingCall in loadbalancer agent tests, dhcp agent tests, linuxbridge agent tests Change-Id: Ib6edbc11feba402a4c2f19b7d6833b49879ee626 Closes-Bug: #1288079 --- neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py | 2 ++ .../unit/services/loadbalancer/agent/test_agent_manager.py | 3 +++ neutron/tests/unit/test_dhcp_agent.py | 5 +++++ 3 files changed, 10 insertions(+) diff --git a/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py b/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py index 9ecd7154037..f5d289c6d46 100644 --- a/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py +++ b/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py @@ -96,6 +96,8 @@ class TestLinuxBridgeAgent(base.BaseTestCase): def setUp(self): super(TestLinuxBridgeAgent, self).setUp() + # disable setting up periodic state reporting + cfg.CONF.set_override('report_interval', 0, 'AGENT') cfg.CONF.set_override('rpc_backend', 'neutron.openstack.common.rpc.impl_fake') self.execute_p = mock.patch.object(ip_lib.IPWrapper, '_execute') diff --git a/neutron/tests/unit/services/loadbalancer/agent/test_agent_manager.py b/neutron/tests/unit/services/loadbalancer/agent/test_agent_manager.py index c17e56ab948..6a593b36733 100644 --- a/neutron/tests/unit/services/loadbalancer/agent/test_agent_manager.py +++ b/neutron/tests/unit/services/loadbalancer/agent/test_agent_manager.py @@ -38,6 +38,9 @@ class TestManager(base.BaseTestCase): 'neutron.services.loadbalancer.agent.agent_api.LbaasAgentApi' ).start() + # disable setting up periodic state reporting + mock_conf.AGENT.report_interval = 0 + self.mgr = manager.LbaasAgentManager(mock_conf) self.rpc_mock = rpc_mock_cls.return_value self.log = mock.patch.object(manager, 'LOG').start() diff --git a/neutron/tests/unit/test_dhcp_agent.py b/neutron/tests/unit/test_dhcp_agent.py index 5ef5e7aa2b6..eb48b175c65 100644 --- a/neutron/tests/unit/test_dhcp_agent.py +++ b/neutron/tests/unit/test_dhcp_agent.py @@ -132,6 +132,9 @@ class TestDhcpAgent(base.BaseTestCase): dhcp_agent.register_options() cfg.CONF.set_override('interface_driver', '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( 'neutron.agent.dhcp_agent.importutils.import_class') self.driver = mock.Mock(name='driver') @@ -143,6 +146,8 @@ class TestDhcpAgent(base.BaseTestCase): def test_dhcp_agent_manager(self): 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, 'sync_state', autospec=True) as mock_sync_state: