x/vmware-nsx
Code Issues Proposed changes

Merge "Don't restore stopped mock that is initialized in setUp()"

Browse Source
This commit is contained in:
Jenkins 2014-12-15 06:02:24 +00:00 committed by Gerrit Code Review
commit 23079637be
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
neutron/tests/unit/test_l3_agent.py
View File

@ -2250,22 +2250,19 @@ class TestL3AgentEventHandler(base.BaseTestCase):
self.external_process_p.stop() self.external_process_p.stop()
ri = l3router.RouterInfo(router_id, None, None) ri = l3router.RouterInfo(router_id, None, None)
try: with mock.patch(ip_class_path) as ip_mock:
with mock.patch(ip_class_path) as ip_mock: self.agent._spawn_metadata_proxy(ri.router_id, ri.ns_name)
self.agent._spawn_metadata_proxy(ri.router_id, ri.ns_name) ip_mock.assert_has_calls([
ip_mock.assert_has_calls([ mock.call('sudo', ri.ns_name),
mock.call('sudo', ri.ns_name), mock.call().netns.execute([
mock.call().netns.execute([ 'neutron-ns-metadata-proxy',
'neutron-ns-metadata-proxy', mock.ANY,
mock.ANY, mock.ANY,
mock.ANY, '--router_id=%s' % router_id,
'--router_id=%s' % router_id, mock.ANY,
mock.ANY, '--metadata_port=%s' % metadata_port,
'--metadata_port=%s' % metadata_port, '--debug',
'--debug', '--log-file=neutron-ns-metadata-proxy-%s.log' %
'--log-file=neutron-ns-metadata-proxy-%s.log' % router_id
router_id ], addl_env=None)
], addl_env=None) ])
])
finally:
self.external_process_p.start()