code and config review after rebase to current master

pull/1346/head
sebres 2015-09-01 20:10:47 +02:00
parent 72f29e9061
commit f143ae479c
2 changed files with 3 additions and 4 deletions

View File

@ -326,9 +326,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

View File

@ -1302,9 +1302,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)