From ba7fadd562db1747f138fc41bcdd0f0c4a1d4204 Mon Sep 17 00:00:00 2001 From: Hui HX Xiang Date: Wed, 9 Oct 2013 23:10:31 -0700 Subject: [PATCH] Correct handling mock.patch.stop method Correct calling the right stop method of mock.patch object. Change-Id: I53cffd78f7597a9a0dc8ec7dbc176d958c85be83 --- neutron/tests/unit/test_linux_dhcp.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/neutron/tests/unit/test_linux_dhcp.py b/neutron/tests/unit/test_linux_dhcp.py index 7842acb6f..bd6b5dadc 100644 --- a/neutron/tests/unit/test_linux_dhcp.py +++ b/neutron/tests/unit/test_linux_dhcp.py @@ -307,7 +307,6 @@ class TestBase(base.BaseTestCase): self.conf.register_opts(dhcp.OPTS) instance = mock.patch("neutron.agent.linux.dhcp.DeviceManager") self.mock_mgr = instance.start() - self.addCleanup(self.mock_mgr.stop) self.conf.register_opt(cfg.BoolOpt('enable_isolated_metadata', default=True)) self.conf(args=args) @@ -316,10 +315,9 @@ class TestBase(base.BaseTestCase): self.replace_p = mock.patch('neutron.agent.linux.utils.replace_file') self.execute_p = mock.patch('neutron.agent.linux.utils.execute') - self.addCleanup(self.replace_p.stop) - self.addCleanup(self.execute_p.stop) self.safe = self.replace_p.start() self.execute = self.execute_p.start() + self.addCleanup(mock.patch.stopall) class TestDhcpBase(TestBase): -- 2.45.2