x/vmware-nsx
Code Issues Proposed changes

Merge "Correct handling mock.patch.stop method"

Browse Source
This commit is contained in:
Jenkins
2013-11-22 02:21:44 +00:00
committed by Gerrit Code Review
parent 8f5991fad8 aa4042677d
commit 9543155b66
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/tests/unit/test_linux_dhcp.py
View File

@@ -339,7 +339,6 @@ class TestBase(base.BaseTestCase):
self.conf.register_opts(dhcp.OPTS) self.conf.register_opts(dhcp.OPTS)
instance = mock.patch("neutron.agent.linux.dhcp.DeviceManager") instance = mock.patch("neutron.agent.linux.dhcp.DeviceManager")
self.mock_mgr = instance.start() self.mock_mgr = instance.start()
self.addCleanup(self.mock_mgr.stop)
self.conf.register_opt(cfg.BoolOpt('enable_isolated_metadata', self.conf.register_opt(cfg.BoolOpt('enable_isolated_metadata',
default=True)) default=True))
self.conf(args=args) self.conf(args=args)
@@ -348,10 +347,9 @@ class TestBase(base.BaseTestCase):
self.replace_p = mock.patch('neutron.agent.linux.utils.replace_file') self.replace_p = mock.patch('neutron.agent.linux.utils.replace_file')
self.execute_p = mock.patch('neutron.agent.linux.utils.execute') 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.safe = self.replace_p.start()
self.execute = self.execute_p.start() self.execute = self.execute_p.start()
self.addCleanup(mock.patch.stopall)
class TestDhcpBase(TestBase): class TestDhcpBase(TestBase):