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

This commit is contained in:
Jenkins 2014-12-15 06:02:24 +00:00 committed by Gerrit Code Review
commit 23079637be

View File

@ -2250,7 +2250,6 @@ class TestL3AgentEventHandler(base.BaseTestCase):
self.external_process_p.stop()
ri = l3router.RouterInfo(router_id, None, None)
try:
with mock.patch(ip_class_path) as ip_mock:
self.agent._spawn_metadata_proxy(ri.router_id, ri.ns_name)
ip_mock.assert_has_calls([
@ -2267,5 +2266,3 @@ class TestL3AgentEventHandler(base.BaseTestCase):
router_id
], addl_env=None)
])
finally:
self.external_process_p.start()