conf.write("-- Autogenerated by dnsdisttests.py\n")
conf.write(cls._config_template % params)
- dnsdistcmd = [os.environ['DNSDISTBIN'], '-C', confFile,
+ dnsdistcmd = [os.environ['DNSDISTBIN'], '--supervised', '-C', confFile,
'-l', '%s:%d' % (cls._dnsDistListeningAddr, cls._dnsDistPort) ]
for acl in cls._acl:
dnsdistcmd.extend(['--acl', acl])
def checkMessageEDNSWithoutOptions(self, expected, received):
self.assertEquals(expected, received)
self.assertEquals(received.edns, 0)
+ self.assertEquals(expected.payload, received.payload)
def checkMessageEDNSWithoutECS(self, expected, received, withCookies=0):
self.assertEquals(expected, received)
self.assertEquals(received.edns, 0)
+ self.assertEquals(expected.payload, received.payload)
self.assertEquals(len(received.options), withCookies)
if withCookies:
for option in received.options:
def checkMessageEDNSWithECS(self, expected, received, additionalOptions=0):
self.assertEquals(expected, received)
self.assertEquals(received.edns, 0)
+ self.assertEquals(expected.payload, received.payload)
self.assertEquals(len(received.options), 1 + additionalOptions)
hasECS = False
for option in received.options: