From dd3ab858dd30d4ebcab09f6d88e03726a9fdad60 Mon Sep 17 00:00:00 2001 From: Steven Hiscocks Date: Sun, 22 Jun 2014 13:56:32 +0100 Subject: [PATCH] TST: actions modifying aInfo test more robust --- fail2ban/tests/actionstestcase.py | 4 ++++ fail2ban/tests/files/action.d/action_modifyainfo.py | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/fail2ban/tests/actionstestcase.py b/fail2ban/tests/actionstestcase.py index 3f968e46..d66930ef 100644 --- a/fail2ban/tests/actionstestcase.py +++ b/fail2ban/tests/actionstestcase.py @@ -157,8 +157,12 @@ class ExecuteActions(LogCaptureTestCase): # Will fail if modification of aInfo from first action propagates # to second action, as both delete same key self.assertFalse(self._is_logged("Failed to execute ban")) + self.assertTrue(self._is_logged("action1 ban deleted aInfo IP")) + self.assertTrue(self._is_logged("action2 ban deleted aInfo IP")) self.__actions._Actions__flushBan() # Will fail if modification of aInfo from first action propagates # to second action, as both delete same key self.assertFalse(self._is_logged("Failed to execute unban")) + self.assertTrue(self._is_logged("action1 unban deleted aInfo IP")) + self.assertTrue(self._is_logged("action2 unban deleted aInfo IP")) diff --git a/fail2ban/tests/files/action.d/action_modifyainfo.py b/fail2ban/tests/files/action.d/action_modifyainfo.py index 0a1d944a..9fbe1e0b 100644 --- a/fail2ban/tests/files/action.d/action_modifyainfo.py +++ b/fail2ban/tests/files/action.d/action_modifyainfo.py @@ -5,7 +5,10 @@ class TestAction(ActionBase): def ban(self, aInfo): del aInfo['ip'] + self._logSys.info("%s ban deleted aInfo IP", self._name) - unban = ban + def unban(self, aInfo): + del aInfo['ip'] + self._logSys.info("%s unban deleted aInfo IP", self._name) Action = TestAction