x/vmware-nsx
Code Issues Proposed changes

Merge "Fix TestDhcpAgentEventHandler test that fails in some Jenkins runs."

Browse Source
This commit is contained in:
Jenkins 2013-07-13 19:10:02 +00:00 committed by Gerrit Code Review
commit 13b5a4454a
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -442,7 +442,10 @@ class TestDhcpAgentEventHandler(base.BaseTestCase):
self.cache = mock.Mock()
cache_cls.return_value = self.cache
self.dhcp = dhcp_agent.DhcpAgent(HOSTNAME)
with mock.patch.object(dhcp.Dnsmasq,
'check_version') as check_v:
check_v.return_value = dhcp.Dnsmasq.MINIMUM_VERSION
self.dhcp = dhcp_agent.DhcpAgent(HOSTNAME)
self.call_driver_p = mock.patch.object(self.dhcp, 'call_driver')
self.call_driver = self.call_driver_p.start()