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

code coverage: extend conditional test with direct replacement inside replaceTag (besides recursive sub tags)

pull/1414/head
sebres 2016-05-11 13:06:16 +02:00
parent e8203dabba
commit f47fdf8918
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fail2ban/tests/actiontestcase.py
View File

@ -149,17 +149,17 @@ class CommandActionTest(LogCaptureTestCase):
cache = self.__action._substCache cache = self.__action._substCache
for i in range(2): for i in range(2):
self.assertEqual( self.assertEqual(
self.__action.replaceTag("<banaction>", self.__action._properties, self.__action.replaceTag("<banaction> '<abc>'", self.__action._properties,
conditional="", cache=cache), conditional="", cache=cache),
"Text 890-123 text 123") "Text 890-123 text 123 '123'")
self.assertEqual( self.assertEqual(
self.__action.replaceTag("<banaction>", self.__action._properties, self.__action.replaceTag("<banaction> '<abc>'", self.__action._properties,
conditional="family=inet4", cache=cache), conditional="family=inet4", cache=cache),
"Text 890-345 text 345") "Text 890-345 text 345 '345'")
self.assertEqual( self.assertEqual(
self.__action.replaceTag("<banaction>", self.__action._properties, self.__action.replaceTag("<banaction> '<abc>'", self.__action._properties,
conditional="family=inet6", cache=cache), conditional="family=inet6", cache=cache),
"Text 890-567 text 567") "Text 890-567 text 567 '567'")
self.assertEqual(len(cache) if cache is not None else -1, 3) self.assertEqual(len(cache) if cache is not None else -1, 3)
# set one parameter - internal properties and cache should be reseted: # set one parameter - internal properties and cache should be reseted:
setattr(self.__action, 'xyz', "000-<abc>") setattr(self.__action, 'xyz', "000-<abc>")
@ -167,17 +167,17 @@ class CommandActionTest(LogCaptureTestCase):
# test againg, should have 000 instead of 890: # test againg, should have 000 instead of 890:
for i in range(2): for i in range(2):
self.assertEqual( self.assertEqual(
self.__action.replaceTag("<banaction>", self.__action._properties, self.__action.replaceTag("<banaction> '<abc>'", self.__action._properties,
conditional="", cache=cache), conditional="", cache=cache),
"Text 000-123 text 123") "Text 000-123 text 123 '123'")
self.assertEqual( self.assertEqual(
self.__action.replaceTag("<banaction>", self.__action._properties, self.__action.replaceTag("<banaction> '<abc>'", self.__action._properties,
conditional="family=inet4", cache=cache), conditional="family=inet4", cache=cache),
"Text 000-345 text 345") "Text 000-345 text 345 '345'")
self.assertEqual( self.assertEqual(
self.__action.replaceTag("<banaction>", self.__action._properties, self.__action.replaceTag("<banaction> '<abc>'", self.__action._properties,
conditional="family=inet6", cache=cache), conditional="family=inet6", cache=cache),
"Text 000-567 text 567") "Text 000-567 text 567 '567'")
self.assertEqual(len(cache), 3) self.assertEqual(len(cache), 3)