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

small performance fix after merge with 0.10

pull/1460/head
sebres 2017-01-21 17:54:01 +01:00 committed by sebres
parent 99634638ba
commit 8e2711681c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fail2ban/tests/action_d/test_smtp.py
View File

@ -82,10 +82,11 @@ class SMTPActionTest(unittest.TestCase):
self._active = False self._active = False
self._loop_thread.join() self._loop_thread.join()
def _exec_and_wait(self, doaction): def _exec_and_wait(self, doaction, timeout=3, short=False):
if short: timeout /= 25
self.smtpd.ready = False self.smtpd.ready = False
doaction() doaction()
Utils.wait_for(lambda: self.smtpd.ready, 3) Utils.wait_for(lambda: self.smtpd.ready, timeout)
def testStart(self): def testStart(self):
self._exec_and_wait(self.action.start) self._exec_and_wait(self.action.start)
@ -114,7 +115,7 @@ class SMTPActionTest(unittest.TestCase):
if restored: if restored:
aInfo['restored'] = 1 aInfo['restored'] = 1
self._exec_and_wait(lambda: self.action.ban(aInfo)) self._exec_and_wait(lambda: self.action.ban(aInfo), short=restored)
if restored: # no mail, should raises attribute error: if restored: # no mail, should raises attribute error:
self.assertRaises(AttributeError, lambda: self.smtpd.mailfrom) self.assertRaises(AttributeError, lambda: self.smtpd.mailfrom)
return return