mirror of https://github.com/fail2ban/fail2ban
code review: back to previous code - no skipping in testReadTestJailConf
parent
8ed5b44bfd
commit
7256a5cb8e
|
@ -498,7 +498,7 @@ class JailsReaderTest(LogCaptureTestCase):
|
||||||
def testReadTestJailConf(self):
|
def testReadTestJailConf(self):
|
||||||
jails = JailsReader(basedir=IMPERFECT_CONFIG, share_config=IMPERFECT_CONFIG_SHARE_CFG)
|
jails = JailsReader(basedir=IMPERFECT_CONFIG, share_config=IMPERFECT_CONFIG_SHARE_CFG)
|
||||||
self.assertTrue(jails.read())
|
self.assertTrue(jails.read())
|
||||||
self.assertTrue(jails.getOptions())
|
self.assertFalse(jails.getOptions(ignoreWrong=False))
|
||||||
self.assertRaises(ValueError, jails.convert)
|
self.assertRaises(ValueError, jails.convert)
|
||||||
comm_commands = jails.convert(allow_no_files=True)
|
comm_commands = jails.convert(allow_no_files=True)
|
||||||
self.maxDiff = None
|
self.maxDiff = None
|
||||||
|
@ -537,7 +537,8 @@ class JailsReaderTest(LogCaptureTestCase):
|
||||||
['config-error',
|
['config-error',
|
||||||
"Jail 'missingbitsjail' skipped, because of wrong configuration: Unable to read the filter 'catchallthebadies'"],
|
"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")
|
self.assertLogged("No file(s) found for glob /weapons/of/mass/destruction")
|
||||||
|
|
||||||
if STOCK:
|
if STOCK:
|
||||||
|
|
Loading…
Reference in New Issue