openstack
/
neutron
Code Issues Proposed changes

Merge "The exception type is wrong and makes the except block not work" into stable/liberty

This commit is contained in:
Jenkins 2015-10-20 15:07:51 +00:00 committed by Gerrit Code Review
parent 8430521c8d 0b5285aecc
commit 3a40988d12
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/agent/l3/ha.py
View File

@ -117,7 +117,7 @@ class AgentMixin(object):
try:
ri = self.router_info[router_id]
except AttributeError:
except KeyError:
LOG.info(_LI('Router %s is not managed by this agent. It was '
'possibly deleted concurrently.'), router_id)
return

7
neutron/tests/unit/agent/l3/test_agent.py
View File

@ -177,6 +177,13 @@ class TestBasicRouterOperations(BasicRouterOperationsFramework):
l3_agent.L3NATAgent(HOSTNAME, self.conf)
self.ensure_dir.assert_called_once_with('/etc/ha/')
def test_enqueue_state_change_router_not_found(self):
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
non_existent_router = 42
# Make sure the exceptional code path has coverage
agent.enqueue_state_change(non_existent_router, 'master')
def test_periodic_sync_routers_task_raise_exception(self):
agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
self.plugin_api.get_routers.side_effect = ValueError