From 993771556332d9b6bbf7eb3f0300cf9d8a2cb464 Mon Sep 17 00:00:00 2001 From: Kevin Benton Date: Thu, 25 Jun 2015 17:55:16 -0700 Subject: [PATCH] Remove double callback manager mocks setup_test_registry_instance() in the base test case class gives each test its own registry by mocking out the get_callback_manager. The L3 agent test cases were duplicating this. Partial-Bug: #1468998 Change-Id: I7356daa846524611e9f92365939e8ad15d1e1cd8 --- neutron/tests/unit/agent/l3/test_agent.py | 6 ------ neutron/tests/unit/agent/l3/test_dvr_local_router.py | 6 ------ 2 files changed, 12 deletions(-) diff --git a/neutron/tests/unit/agent/l3/test_agent.py b/neutron/tests/unit/agent/l3/test_agent.py index d99b1c42d..ba74a975f 100644 --- a/neutron/tests/unit/agent/l3/test_agent.py +++ b/neutron/tests/unit/agent/l3/test_agent.py @@ -40,8 +40,6 @@ from neutron.agent.linux import interface from neutron.agent.linux import ra from neutron.agent.metadata import driver as metadata_driver from neutron.agent import rpc as agent_rpc -from neutron.callbacks import manager -from neutron.callbacks import registry from neutron.common import config as base_config from neutron.common import constants as l3_constants from neutron.common import exceptions as n_exc @@ -163,10 +161,6 @@ class BasicRouterOperationsFramework(base.BaseTestCase): self.ri_kwargs = {'agent_conf': self.conf, 'interface_driver': self.mock_driver} - self._callback_manager = manager.CallbacksManager() - mock.patch.object(registry, '_get_callback_manager', - return_value=self._callback_manager).start() - def _process_router_instance_for_agent(self, agent, ri, router): ri.router = router if not ri.radvd: diff --git a/neutron/tests/unit/agent/l3/test_dvr_local_router.py b/neutron/tests/unit/agent/l3/test_dvr_local_router.py index 1e81c8d48..fe41f2fe8 100644 --- a/neutron/tests/unit/agent/l3/test_dvr_local_router.py +++ b/neutron/tests/unit/agent/l3/test_dvr_local_router.py @@ -27,8 +27,6 @@ from neutron.agent.l3 import router_info from neutron.agent.linux import external_process from neutron.agent.linux import interface from neutron.agent.linux import ip_lib -from neutron.callbacks import manager -from neutron.callbacks import registry from neutron.common import config as base_config from neutron.common import constants as l3_constants from neutron.common import utils as common_utils @@ -147,10 +145,6 @@ class TestDvrRouterOperations(base.BaseTestCase): self.ri_kwargs = {'agent_conf': self.conf, 'interface_driver': self.mock_driver} - self._callback_manager = manager.CallbacksManager() - mock.patch.object(registry, '_get_callback_manager', - return_value=self._callback_manager).start() - def _create_router(self, router=None, **kwargs): agent_conf = mock.Mock() self.router_id = _uuid() -- 2.45.2