From d21fa9bfc845221f5b62e4221008c20ade7cbf88 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Thu, 4 Dec 2014 11:31:24 +0100 Subject: [PATCH] Don't restore stopped mock that is initialized in setUp() Since this mock will be reinitialized for consequent test cases when calling setUp(), it's not needed to restart it in the case. Change-Id: Ib120bf09d24dccc0b09fae906dae05c69efe734a --- neutron/tests/unit/test_l3_agent.py | 35 +++++++++++++---------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/neutron/tests/unit/test_l3_agent.py b/neutron/tests/unit/test_l3_agent.py index e50eda7cc..41bd46d61 100644 --- a/neutron/tests/unit/test_l3_agent.py +++ b/neutron/tests/unit/test_l3_agent.py @@ -2217,22 +2217,19 @@ 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([ - mock.call('sudo', ri.ns_name), - mock.call().netns.execute([ - 'neutron-ns-metadata-proxy', - mock.ANY, - mock.ANY, - '--router_id=%s' % router_id, - mock.ANY, - '--metadata_port=%s' % metadata_port, - '--debug', - '--log-file=neutron-ns-metadata-proxy-%s.log' % - router_id - ], addl_env=None) - ]) - finally: - self.external_process_p.start() + 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([ + mock.call('sudo', ri.ns_name), + mock.call().netns.execute([ + 'neutron-ns-metadata-proxy', + mock.ANY, + mock.ANY, + '--router_id=%s' % router_id, + mock.ANY, + '--metadata_port=%s' % metadata_port, + '--debug', + '--log-file=neutron-ns-metadata-proxy-%s.log' % + router_id + ], addl_env=None) + ]) -- 2.45.2