From 7256a5cb8e0c37bca69fd684bd3e568a4cc46540 Mon Sep 17 00:00:00 2001 From: sebres Date: Tue, 22 Nov 2016 17:55:27 +0100 Subject: [PATCH] code review: back to previous code - no skipping in testReadTestJailConf --- fail2ban/tests/clientreadertestcase.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fail2ban/tests/clientreadertestcase.py b/fail2ban/tests/clientreadertestcase.py index 33c217cd..5129df61 100644 --- a/fail2ban/tests/clientreadertestcase.py +++ b/fail2ban/tests/clientreadertestcase.py @@ -498,7 +498,7 @@ class JailsReaderTest(LogCaptureTestCase): def testReadTestJailConf(self): jails = JailsReader(basedir=IMPERFECT_CONFIG, share_config=IMPERFECT_CONFIG_SHARE_CFG) self.assertTrue(jails.read()) - self.assertTrue(jails.getOptions()) + self.assertFalse(jails.getOptions(ignoreWrong=False)) self.assertRaises(ValueError, jails.convert) comm_commands = jails.convert(allow_no_files=True) self.maxDiff = None @@ -537,7 +537,8 @@ class JailsReaderTest(LogCaptureTestCase): ['config-error', "Jail 'missingbitsjail' skipped, because of wrong configuration: Unable to read the filter 'catchallthebadies'"], ])) - self.assertLogged("Errors in jail 'missingbitsjail'. Skipping...") + self.assertLogged("Errors in jail 'missingbitsjail'.") + self.assertNotLogged("Skipping...") self.assertLogged("No file(s) found for glob /weapons/of/mass/destruction") if STOCK: