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

diff --git a/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py b/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
index 9ecd71540374419bd385204a0539faf4a6c07525..f5d289c6d46ac00ea5c1fed1c59fd23c45c2b0e2 100644 (file)
--- 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 c17e56ab948abb7ae301b5432a1b1fc71453b64b..6a593b367332fa242290e0dbf2c078da8429403f 100644 (file)
--- 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 5ef5e7aa2b68f71cdec18f7933d841d6f9395476..eb48b175c657680e96b3d4bf70e395527c2ae746 100644 (file)
--- 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: