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

normalize name of the test cases: method and class name fixed for MonitorJournalFailures

pull/1515/head
sebres 2016-08-17 17:48:57 +02:00
parent 4bb5f3492e
commit 9aca34d3b1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fail2ban/tests/filtertestcase.py
View File

@ -727,7 +727,7 @@ def get_monitor_failures_testcase(Filter_):
# add Filter_'s name so we could easily identify bad cows # add Filter_'s name so we could easily identify bad cows
testclass_name = tempfile.mktemp( testclass_name = tempfile.mktemp(
'fail2ban', 'monitorfailures_%s' % (Filter_.__name__,)) 'fail2ban', 'monitorfailures_%s_' % (Filter_.__name__,))
class MonitorFailures(CommonMonitorTestCase): class MonitorFailures(CommonMonitorTestCase):
count = 0 count = 0
@ -924,6 +924,8 @@ def get_monitor_failures_journal_testcase(Filter_): # pragma: systemd no cover
"""Generator of TestCase's for journal based filters/backends """Generator of TestCase's for journal based filters/backends
""" """
testclass_name = "monitorjournalfailures_%s" % (Filter_.__name__,)
class MonitorJournalFailures(CommonMonitorTestCase): class MonitorJournalFailures(CommonMonitorTestCase):
def setUp(self): def setUp(self):
"""Call before every test case.""" """Call before every test case."""
@ -934,7 +936,7 @@ def get_monitor_failures_journal_testcase(Filter_): # pragma: systemd no cover
# UUID used to ensure that only meeages generated # UUID used to ensure that only meeages generated
# as part of this test are picked up by the filter # as part of this test are picked up by the filter
self.test_uuid = str(uuid.uuid4()) self.test_uuid = str(uuid.uuid4())
self.name = "monitorjournalfailures-%s" % self.test_uuid self.name = "%s-%s" % (testclass_name, self.test_uuid)
self.filter.addJournalMatch([ self.filter.addJournalMatch([
"SYSLOG_IDENTIFIER=fail2ban-testcases", "SYSLOG_IDENTIFIER=fail2ban-testcases",
"TEST_FIELD=1", "TEST_FIELD=1",
@ -954,10 +956,6 @@ def get_monitor_failures_journal_testcase(Filter_): # pragma: systemd no cover
self.filter.join() # wait for the thread to terminate self.filter.join() # wait for the thread to terminate
pass pass
def __str__(self):
return "MonitorJournalFailures%s(%s)" \
% (Filter_, hasattr(self, 'name') and self.name or 'tempfile')
def assert_correct_ban(self, test_ip, test_attempts): def assert_correct_ban(self, test_ip, test_attempts):
self.assertTrue(self.waitFailTotal(test_attempts, 10)) # give Filter a chance to react self.assertTrue(self.waitFailTotal(test_attempts, 10)) # give Filter a chance to react
ticket = self.jail.getFailTicket() ticket = self.jail.getFailTicket()
@ -1029,6 +1027,8 @@ def get_monitor_failures_journal_testcase(Filter_): # pragma: systemd no cover
# we should detect the failures # we should detect the failures
self.assertTrue(self.isFilled(10)) self.assertTrue(self.isFilled(10))
MonitorJournalFailures.__name__ = "MonitorJournalFailures<%s>(%s)" \
% (Filter_.__name__, testclass_name)
return MonitorJournalFailures return MonitorJournalFailures