x/vmware-nsx
Code Issues Proposed changes

Merge "Mock os.makdirs to avoid directory creation in unit tests"

Browse Source
This commit is contained in:
Jenkins 2013-08-15 18:21:22 +00:00 committed by Gerrit Code Review
commit 1a749a0d1d
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
neutron/tests/unit/test_dhcp_agent.py
View File

@ -138,9 +138,12 @@ class TestDhcpAgent(base.BaseTestCase):
self.driver.existing_dhcp_networks.return_value = []
self.driver_cls = self.driver_cls_p.start()
self.driver_cls.return_value = self.driver
self.mock_makedirs_p = mock.patch("os.makedirs")
self.mock_makedirs = self.mock_makedirs_p.start()
def tearDown(self):
self.driver_cls_p.stop()
self.mock_makedirs_p.stop()
cfg.CONF.reset()
super(TestDhcpAgent, self).tearDown()
@ -407,6 +410,11 @@ class TestDhcpAgentEventHandler(base.BaseTestCase):
cache_cls = self.cache_p.start()
self.cache = mock.Mock()
cache_cls.return_value = self.cache
self.mock_makedirs_p = mock.patch("os.makedirs")
self.mock_makedirs = self.mock_makedirs_p.start()
self.mock_init_p = mock.patch('neutron.agent.dhcp_agent.'
'DhcpAgent._populate_networks_cache')
self.mock_init = self.mock_init_p.start()
with mock.patch.object(dhcp.Dnsmasq,
'check_version') as check_v:
@ -425,6 +433,8 @@ class TestDhcpAgentEventHandler(base.BaseTestCase):
self.call_driver_p.stop()
self.cache_p.stop()
self.plugin_p.stop()
self.mock_makedirs_p.stop()
self.mock_init_p.stop()
cfg.CONF.reset()
super(TestDhcpAgentEventHandler, self).tearDown()