github
/
fail2ban
mirror of https://github.com/fail2ban/fail2ban
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1400 from yarikoptic/bf-cymru 

BF+ENH: fixed up testing querying cymru information + assert_dict_equal
pull/1404/head
Yaroslav Halchenko 2016-04-27 08:36:42 -04:00
parent aa303acfd6 340a5a23f4
commit d2f1de5da8
2 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
fail2ban/tests/banmanagertestcase.py
View File

@ -28,7 +28,7 @@ import unittest
from ..server.banmanager import BanManager from ..server.banmanager import BanManager
from ..server.ticket import BanTicket from ..server.ticket import BanTicket
from .utils import assert_dict_equal
class AddFailure(unittest.TestCase): class AddFailure(unittest.TestCase):
def setUp(self): def setUp(self):
@ -74,15 +74,10 @@ class StatusExtendedCymruInfo(unittest.TestCase):
def testCymruInfo(self): def testCymruInfo(self):
cymru_info = self.__banManager.getBanListExtendedCymruInfo() cymru_info = self.__banManager.getBanListExtendedCymruInfo()
if "assertDictEqual" in dir(self): assert_dict_equal(cymru_info,
self.assertDictEqual(cymru_info, {"asn": [self.__asn], {"asn": [self.__asn],
"country": [self.__country], "country": [self.__country],
"rir": [self.__rir]}) "rir": [self.__rir]})
else:
# Python 2.6 does not support assertDictEqual()
self.assertEqual(cymru_info["asn"], [self.__asn])
self.assertEqual(cymru_info["country"], [self.__country])
self.assertEqual(cymru_info["rir"], [self.__rir])
def testCymruInfoASN(self): def testCymruInfoASN(self):
self.assertEqual( self.assertEqual(
@ -100,16 +95,24 @@ class StatusExtendedCymruInfo(unittest.TestCase):
[self.__rir]) [self.__rir])
def testCymruInfoNxdomain(self): def testCymruInfoNxdomain(self):
ticket = BanTicket("10.0.0.0", 1167605999.0)
self.__banManager = BanManager() self.__banManager = BanManager()
# non-existing IP
ticket = BanTicket("0.0.0.0", 1167605999.0)
self.assertTrue(self.__banManager.addBanTicket(ticket)) self.assertTrue(self.__banManager.addBanTicket(ticket))
cymru_info = self.__banManager.getBanListExtendedCymruInfo() cymru_info = self.__banManager.getBanListExtendedCymruInfo()
if "assertDictEqual" in dir(self): assert_dict_equal(cymru_info,
self.assertDictEqual(cymru_info, {"asn": ["nxdomain"], {"asn": ["nxdomain"],
"country": ["nxdomain"], "country": ["nxdomain"],
"rir": ["nxdomain"]}) "rir": ["nxdomain"]})
else:
# Python 2.6 does not support assertDictEqual() # even for private IPs ASNs defined
self.assertEqual(cymru_info["asn"], ["nxdomain"]) # Since it outputs for all active tickets we would get previous results
self.assertEqual(cymru_info["country"], ["nxdomain"]) # and new ones
self.assertEqual(cymru_info["rir"], ["nxdomain"]) ticket = BanTicket("10.0.0.0", 1167606000.0)
self.assertTrue(self.__banManager.addBanTicket(ticket))
cymru_info = self.__banManager.getBanListExtendedCymruInfo()
assert_dict_equal(cymru_info,
{"asn": ["nxdomain", "4565",],
"country": ["nxdomain", "unknown"],
"rir": ["nxdomain", "other"]})

6
fail2ban/tests/utils.py
View File

@ -313,3 +313,9 @@ else:
return True return True
else: else:
return False return False
# Python 2.6 compatibility. in 2.7 assertDictEqual
def assert_dict_equal(a, b):
assert isinstance(a, dict), "Object is not dictionary: %r" % a
assert isinstance(b, dict), "Object is not dictionary: %r" % b
assert a==b, "Dictionaries differ:\n%r !=\n%r" % (a, b)