x/vmware-nsx
Code Issues Proposed changes

Merge "Treat case when pid is None"

Browse Source
This commit is contained in:
Jenkins 2012-11-12 21:05:58 +00:00 committed by Gerrit Code Review
commit ca6271105b
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
quantum/agent/linux/dhcp.py
View File

@ -167,6 +167,9 @@ class DhcpLocalProcess(DhcpBase):
@property
def active(self):
pid = self.pid
if pid is None:
return False
cmd = ['cat', '/proc/%s/cmdline' % pid]
try:
return self.network.id in utils.execute(cmd, self.root_helper)

8
quantum/tests/unit/test_linux_dhcp.py
View File

@ -230,6 +230,14 @@ class TestDhcpLocalProcess(TestBase):
self.execute.assert_called_once_with(['cat', '/proc/4/cmdline'],
'sudo')
def test_active_none(self):
dummy_cmd_line = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'
self.execute.return_value = (dummy_cmd_line, '')
with mock.patch.object(LocalChild, 'pid') as pid:
pid.__get__ = mock.Mock(return_value=None)
lp = LocalChild(self.conf, FakeV4Network())
self.assertFalse(lp.active)
def test_active_cmd_mismatch(self):
dummy_cmd_line = 'bbbbbbbb-bbbb-bbbb-aaaa-aaaaaaaaaaaa'
self.execute.return_value = (dummy_cmd_line, '')