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

unordered (python 2.6) compatibility fix and coverage extended;

pull/1266/head
sebres 2015-12-02 21:06:32 +01:00
parent 3a179ec5d7
commit 6ce7522d3c
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fail2ban/tests/filtertestcase.py
View File

@ -859,6 +859,16 @@ class GetFailures(LogCaptureTestCase):
self.filter.delLogPath(GetFailures.FILENAME_01) self.filter.delLogPath(GetFailures.FILENAME_01)
self.assertEqual(self.filter.getLogPath(),[]) self.assertEqual(self.filter.getLogPath(),[])
def testNoLogAdded(self):
self.filter.addLogPath(GetFailures.FILENAME_01, tail=True)
self.assertTrue(self.filter.containsLogPath(GetFailures.FILENAME_01))
self.filter.delLogPath(GetFailures.FILENAME_01)
self.assertFalse(self.filter.containsLogPath(GetFailures.FILENAME_01))
# and unknown (safety and cover)
self.assertFalse(self.filter.containsLogPath('unknown.log'))
self.filter.delLogPath('unknown.log')
def testGetFailures01(self, filename=None, failures=None): def testGetFailures01(self, filename=None, failures=None):
filename = filename or GetFailures.FILENAME_01 filename = filename or GetFailures.FILENAME_01
failures = failures or GetFailures.FAILURES_01 failures = failures or GetFailures.FAILURES_01

20
fail2ban/tests/servertestcase.py
View File

@ -113,19 +113,15 @@ class TransmitterBase(unittest.TestCase):
self.assertEqual( self.assertEqual(
self.transm.proceed(["get", jail, cmd]), (0, [])) self.transm.proceed(["get", jail, cmd]), (0, []))
for n, value in enumerate(values): for n, value in enumerate(values):
self.assertEqual( ret = self.transm.proceed(["set", jail, cmdAdd, value])
self.transm.proceed(["set", jail, cmdAdd, value]), self.assertEqual((ret[0], sorted(ret[1])), (0, sorted(values[:n+1])))
(0, values[:n+1])) ret = self.transm.proceed(["get", jail, cmd])
self.assertEqual( self.assertEqual((ret[0], sorted(ret[1])), (0, sorted(values[:n+1])))
self.transm.proceed(["get", jail, cmd]),
(0, values[:n+1]))
for n, value in enumerate(values): for n, value in enumerate(values):
self.assertEqual( ret = self.transm.proceed(["set", jail, cmdDel, value])
self.transm.proceed(["set", jail, cmdDel, value]), self.assertEqual((ret[0], sorted(ret[1])), (0, sorted(values[n+1:])))
(0, values[n+1:])) ret = self.transm.proceed(["get", jail, cmd])
self.assertEqual( self.assertEqual((ret[0], sorted(ret[1])), (0, sorted(values[n+1:])))
self.transm.proceed(["get", jail, cmd]),
(0, values[n+1:]))
def jailAddDelRegexTest(self, cmd, inValues, outValues, jail): def jailAddDelRegexTest(self, cmd, inValues, outValues, jail):
cmdAdd = "add" + cmd cmdAdd = "add" + cmd