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

RF+TST: bring inBanList back from private to protected and enabled its rudimentary unittests

pull/164/merge
Yaroslav Halchenko 2013-03-29 15:32:43 -04:00
parent 08dd6fed26
commit 33a31e096a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/banmanager.py
View File

@ -148,7 +148,7 @@ class BanManager:
def addBanTicket(self, ticket): def addBanTicket(self, ticket):
try: try:
self.__lock.acquire() self.__lock.acquire()
if not self.__inBanList(ticket): if not self._inBanList(ticket):
self.__banList.append(ticket) self.__banList.append(ticket)
self.__banTotal += 1 self.__banTotal += 1
return True return True
@ -177,7 +177,7 @@ class BanManager:
# @param ticket the ticket # @param ticket the ticket
# @return True if a ticket already exists # @return True if a ticket already exists
def __inBanList(self, ticket): def _inBanList(self, ticket):
for i in self.__banList: for i in self.__banList:
if ticket.getIP() == i.getIP(): if ticket.getIP() == i.getIP():
return True return True

8
testcases/banmanagertestcase.py
View File

@ -49,11 +49,11 @@ class AddFailure(unittest.TestCase):
self.assertFalse(self.__banManager.addBanTicket(self.__ticket)) self.assertFalse(self.__banManager.addBanTicket(self.__ticket))
self.assertEqual(self.__banManager.size(), 1) self.assertEqual(self.__banManager.size(), 1)
def _testInListOK(self): def testInListOK(self):
ticket = BanTicket('193.168.0.128', 1167605999.0) ticket = BanTicket('193.168.0.128', 1167605999.0)
self.assertTrue(self.__banManager.inBanList(ticket)) self.assertTrue(self.__banManager._inBanList(ticket))
def _testInListNOK(self): def testInListNOK(self):
ticket = BanTicket('111.111.1.111', 1167605999.0) ticket = BanTicket('111.111.1.111', 1167605999.0)
self.assertFalse(self.__banManager.inBanList(ticket)) self.assertFalse(self.__banManager._inBanList(ticket))