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

prevent theoretical time-related assertion errors for other filters, replace isFilled with waitFailTotal (known expected failure count)

pull/1515/head
sebres 2016-08-17 15:46:44 +02:00
parent 67e4ac5c66
commit f91ec84bfb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fail2ban/tests/filtertestcase.py
View File

@ -83,7 +83,7 @@ def _killfile(f, name):
def _maxWaitTime(wtime): def _maxWaitTime(wtime):
if unittest.F2B.fast: if unittest.F2B.fast: # pragma: no cover
wtime /= 10 wtime /= 10
return wtime return wtime
@ -715,7 +715,7 @@ class CommonMonitorTestCase(unittest.TestCase):
""" """
return Utils.wait_for(self.jail.isFilled, _maxWaitTime(delay)) return Utils.wait_for(self.jail.isFilled, _maxWaitTime(delay))
def isEmpty(self, delay=_maxWaitTime(5)): def isEmpty(self, delay=5):
"""Wait up to `delay` sec to assure that it empty again """Wait up to `delay` sec to assure that it empty again
""" """
return Utils.wait_for(self.jail.isEmpty, _maxWaitTime(delay)) return Utils.wait_for(self.jail.isEmpty, _maxWaitTime(delay))
@ -772,7 +772,7 @@ def get_monitor_failures_testcase(Filter_):
Utils.wait_for(self.filter.isAlive, _maxWaitTime(5)) Utils.wait_for(self.filter.isAlive, _maxWaitTime(5))
def assert_correct_last_attempt(self, failures, count=None): def assert_correct_last_attempt(self, failures, count=None):
self.assertTrue(self.isFilled(10)) # give Filter a chance to react self.assertTrue(self.waitFailTotal(count if count else failures[1], 10))
_assert_correct_last_attempt(self, self.jail, failures, count=count) _assert_correct_last_attempt(self, self.jail, failures, count=count)
def test_grow_file(self): def test_grow_file(self):
@ -788,7 +788,7 @@ def get_monitor_failures_testcase(Filter_):
_copy_lines_between_files(GetFailures.FILENAME_01, self.file, skip=5) _copy_lines_between_files(GetFailures.FILENAME_01, self.file, skip=5)
self.assertTrue(self.isFilled(10)) self.assertTrue(self.isFilled(10))
# so we sleep for up to 2 sec for it not to become empty, # so we sleep a bit for it not to become empty,
# and meanwhile pass to other thread(s) and filter should # and meanwhile pass to other thread(s) and filter should
# have gathered new failures and passed them into the # have gathered new failures and passed them into the
# DummyJail # DummyJail