code and config review after rebase to current master

f2b-perfom-prepare-716
sebres 9 years ago
parent 4dc7744927
commit af4b13115b

@ -327,9 +327,8 @@ class Server:
def isAlive(self, jailnum=None):
if jailnum is not None and len(self.__jails) != jailnum:
return 0
for j in self.__jails:
j = self.__jails[j]
if not j.isAlive():
for jail in self.__jails.values():
if not jail.isAlive():
return 0
return 1

@ -1231,9 +1231,9 @@ class DNSUtilsNetworkTests(unittest.TestCase):
self.assertEqual(res, [])
def testIpToName(self):
unittest.F2B.SkipIfNoNetwork()
res = DNSUtils.ipToName('8.8.4.4')
self.assertEqual(res, 'google-public-dns-b.google.com')
unittest.F2B.SkipIfNoNetwork()
# invalid ip (TEST-NET-1 according to RFC 5737)
res = DNSUtils.ipToName('192.0.2.0')
self.assertEqual(res, None)

Loading…
Cancel
Save