Merge branch '0.10' into 0.11

pull/2897/head
sebres 2020-12-22 20:40:52 +01:00
commit 567039f261
1 changed files with 5 additions and 4 deletions

View File

@ -29,6 +29,7 @@ import unittest
from .utils import setUpMyTime, tearDownMyTime from .utils import setUpMyTime, tearDownMyTime
from ..server.banmanager import BanManager from ..server.banmanager import BanManager
from ..server.ipdns import DNSUtils
from ..server.ticket import BanTicket from ..server.ticket import BanTicket
class AddFailure(unittest.TestCase): class AddFailure(unittest.TestCase):
@ -176,10 +177,10 @@ class StatusExtendedCymruInfo(unittest.TestCase):
super(StatusExtendedCymruInfo, self).setUp() super(StatusExtendedCymruInfo, self).setUp()
unittest.F2B.SkipIfNoNetwork() unittest.F2B.SkipIfNoNetwork()
setUpMyTime() setUpMyTime()
self.__ban_ip = "93.184.216.34" self.__ban_ip = iter(DNSUtils.dnsToIp("resolver1.opendns.com")).next()
self.__asn = "15133" self.__asn = "36692"
self.__country = "EU" self.__country = "US"
self.__rir = "ripencc" self.__rir = "arin"
ticket = BanTicket(self.__ban_ip, 1167605999.0) ticket = BanTicket(self.__ban_ip, 1167605999.0)
self.__banManager = BanManager() self.__banManager = BanManager()
self.assertTrue(self.__banManager.addBanTicket(ticket)) self.assertTrue(self.__banManager.addBanTicket(ticket))