From 8451f720f03c8b7535deba7b3b3993458edbe720 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Sat, 7 Dec 2013 11:04:06 +1100 Subject: [PATCH] TST: fix flushlogs and include test for STDERR flushing --- testcases/servertestcase.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testcases/servertestcase.py b/testcases/servertestcase.py index af6f538d..e6137d2f 100644 --- a/testcases/servertestcase.py +++ b/testcases/servertestcase.py @@ -522,7 +522,7 @@ class TransmitterLogging(TransmitterBase): self.setGetTestNOK("loglevel", "Bird") def testFlushLogs(self): - self.assertEqual(self.transm.proceed(["flushlogs"]), (0, "flushed")) + self.assertEqual(self.transm.proceed(["flushlogs"]), (0, "rolled over")) try: f, fn = tempfile.mkstemp("fail2ban.log") os.close(f) @@ -534,7 +534,7 @@ class TransmitterLogging(TransmitterBase): os.close(f2) os.rename(fn, fn2) 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") with open(fn2,'r') as f: self.assertTrue(f.next().endswith("Before file moved\n")) @@ -547,6 +547,8 @@ class TransmitterLogging(TransmitterBase): os.remove(fn2) finally: 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):