Merge "Ensure dnsmasq is down before enabling it in restart method"
This commit is contained in:
@@ -1094,8 +1094,8 @@ class TestDhcpBase(TestBase):
|
||||
def enable(self):
|
||||
self.called.append('enable')
|
||||
|
||||
def disable(self, retain_port=False):
|
||||
self.called.append('disable %s' % retain_port)
|
||||
def disable(self, retain_port=False, block=False):
|
||||
self.called.append('disable %s %s' % (retain_port, block))
|
||||
|
||||
def reload_allocations(self):
|
||||
pass
|
||||
@@ -1106,7 +1106,7 @@ class TestDhcpBase(TestBase):
|
||||
|
||||
c = SubClass()
|
||||
c.restart()
|
||||
self.assertEqual(c.called, ['disable True', 'enable'])
|
||||
self.assertEqual(c.called, ['disable True True', 'enable'])
|
||||
|
||||
|
||||
class TestDhcpLocalProcess(TestBase):
|
||||
|
||||
Reference in New Issue
Block a user