diff --git a/testcases/actiontestcase.py b/testcases/actiontestcase.py index 9a7776ac..1aa9f24e 100644 --- a/testcases/actiontestcase.py +++ b/testcases/actiontestcase.py @@ -69,11 +69,11 @@ class ExecuteAction(unittest.TestCase): self.assertFalse(Action.substituteRecursiveTags({'A': '', 'B': ''})) self.assertFalse(Action.substituteRecursiveTags({'A': '', 'B': '', 'C': ''})) # missing tags are ok - self.assertEquals(Action.substituteRecursiveTags({'A': ''}), {'A': ''}) - self.assertEquals(Action.substituteRecursiveTags({'A': ' ','X':'fun'}), {'A': ' fun', 'X':'fun'}) - self.assertEquals(Action.substituteRecursiveTags({'A': ' ', 'B': 'cool'}), {'A': ' cool', 'B': 'cool'}) + self.assertEqual(Action.substituteRecursiveTags({'A': ''}), {'A': ''}) + self.assertEqual(Action.substituteRecursiveTags({'A': ' ','X':'fun'}), {'A': ' fun', 'X':'fun'}) + self.assertEqual(Action.substituteRecursiveTags({'A': ' ', 'B': 'cool'}), {'A': ' cool', 'B': 'cool'}) # rest is just cool - self.assertEquals(Action.substituteRecursiveTags(aInfo), + self.assertEqual(Action.substituteRecursiveTags(aInfo), { 'HOST': "192.0.2.0", 'ABC': '123 192.0.2.0', 'xyz': '890 123 192.0.2.0', diff --git a/testcases/clientreadertestcase.py b/testcases/clientreadertestcase.py index 948431b3..695b3877 100644 --- a/testcases/clientreadertestcase.py +++ b/testcases/clientreadertestcase.py @@ -108,7 +108,7 @@ class JailReaderTest(unittest.TestCase): action = "mail-whois[name=SSH]" expected = ['mail-whois', {'name': 'SSH'}] result = JailReader.splitAction(action) - self.assertEquals(expected, result) + self.assertEqual(expected, result) class JailsReaderTest(unittest.TestCase):