openstack
/
neutron
Code Issues Proposed changes

Tweak mocking logic for L3 plugin tests 

I stumbled upon this and I was baffled as to why the rpc notifier
was being mocked up the way it was. I think this calls for some
sanity-checking and this patch attempts to bring some common sense
in the test, or I could be barking up at wrong tree...woof woof

Change-Id: I57cf2d6a18ce37ef65fbf9d87d6de70c0178c6ca
This commit is contained in:
armando-migliaccio 2015-02-10 12:17:37 -08:00
parent a97b9a4944
commit 1ad70b828d
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
neutron/tests/unit/test_l3_plugin.py
View File

@ -2141,20 +2141,13 @@ class L3AgentDbTestCaseBase(L3NatTestCaseMixin):
def _test_notify_op_agent(self, target_func, *args):
l3_rpc_agent_api_str = (
'neutron.api.rpc.agentnotifiers.l3_rpc_agent_api.L3AgentNotifyAPI')
plugin = manager.NeutronManager.get_service_plugins()[
service_constants.L3_ROUTER_NAT]
oldNotify = plugin.l3_rpc_notifier
try:
with mock.patch(l3_rpc_agent_api_str) as notifyApi:
plugin.l3_rpc_notifier = notifyApi
kargs = [item for item in args]
kargs.append(notifyApi)
target_func(*kargs)
except Exception:
plugin.l3_rpc_notifier = oldNotify
raise
else:
plugin.l3_rpc_notifier = oldNotify
with mock.patch(l3_rpc_agent_api_str):
plugin = manager.NeutronManager.get_service_plugins()[
service_constants.L3_ROUTER_NAT]
notifyApi = plugin.l3_rpc_notifier
kargs = [item for item in args]
kargs.append(notifyApi)
target_func(*kargs)
def _test_router_gateway_op_agent(self, notifyApi):
with self.router() as r: