From 4a4780be0456ec958c93833f9c2beb02dd08e5e2 Mon Sep 17 00:00:00 2001 From: sebres Date: Thu, 27 Dec 2018 18:10:09 +0100 Subject: [PATCH] test-cases: prevent sporadic timing errors (unban if ban still not occurred) --- fail2ban/tests/servertestcase.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fail2ban/tests/servertestcase.py b/fail2ban/tests/servertestcase.py index 610a1a5d..8c2d0e3e 100644 --- a/fail2ban/tests/servertestcase.py +++ b/fail2ban/tests/servertestcase.py @@ -64,7 +64,7 @@ class TestServer(Server): pass -class TransmitterBase(unittest.TestCase): +class TransmitterBase(LogCaptureTestCase): def setUp(self): """Call before every test case.""" @@ -332,11 +332,11 @@ class Transmitter(TransmitterBase): self.assertEqual( self.transm.proceed(["set", self.jailName, "banip", "127.0.0.1"]), (0, "127.0.0.1")) - time.sleep(Utils.DEFAULT_SLEEP_TIME) # Give chance to ban + self.assertLogged("Ban 127.0.0.1", wait=True) # Give chance to ban self.assertEqual( self.transm.proceed(["set", self.jailName, "banip", "Badger"]), (0, "Badger")) #NOTE: Is IP address validated? Is DNS Lookup done? - time.sleep(Utils.DEFAULT_SLEEP_TIME) # Give chance to ban + self.assertLogged("Ban Badger", wait=True) # Give chance to ban # Unban IP self.assertEqual( self.transm.proceed(