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

TST: fix flushlogs and include test for STDERR flushing

pull/470/head
Daniel Black 2013-12-07 11:04:06 +11:00
parent 476bbdd284
commit 8451f720f0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
testcases/servertestcase.py
View File

@ -522,7 +522,7 @@ class TransmitterLogging(TransmitterBase):
self.setGetTestNOK("loglevel", "Bird") self.setGetTestNOK("loglevel", "Bird")
def testFlushLogs(self): def testFlushLogs(self):
self.assertEqual(self.transm.proceed(["flushlogs"]), (0, "flushed")) self.assertEqual(self.transm.proceed(["flushlogs"]), (0, "rolled over"))
try: try:
f, fn = tempfile.mkstemp("fail2ban.log") f, fn = tempfile.mkstemp("fail2ban.log")
os.close(f) os.close(f)
@ -534,7 +534,7 @@ class TransmitterLogging(TransmitterBase):
os.close(f2) os.close(f2)
os.rename(fn, fn2) os.rename(fn, fn2)
logSys.warn("After file moved") logSys.warn("After file moved")
self.assertEqual(self.transm.proceed(["flushlogs"]), (0, "flushed")) self.assertEqual(self.transm.proceed(["flushlogs"]), (0, "rolled over"))
logSys.warn("After flushlogs") logSys.warn("After flushlogs")
with open(fn2,'r') as f: with open(fn2,'r') as f:
self.assertTrue(f.next().endswith("Before file moved\n")) self.assertTrue(f.next().endswith("Before file moved\n"))
@ -547,6 +547,8 @@ class TransmitterLogging(TransmitterBase):
os.remove(fn2) os.remove(fn2)
finally: finally:
os.remove(fn) os.remove(fn)
self.assertEqual(self.transm.proceed(["set", "logtarget", "STDERR"]), (0, "STDERR"))
self.assertEqual(self.transm.proceed(["flushlogs"]), (0, "flushed"))
class JailTests(unittest.TestCase): class JailTests(unittest.TestCase):