From e916fcdce4cd5a0b927644c9f79e75375e8141d0 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Fri, 13 Dec 2013 10:51:38 +0000 Subject: [PATCH] TST: test case for actions and filters missing in a jail --- testcases/clientreadertestcase.py | 9 +++++++++ testcases/config/jail.conf | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/testcases/clientreadertestcase.py b/testcases/clientreadertestcase.py index 2dec428e..e85ddff8 100644 --- a/testcases/clientreadertestcase.py +++ b/testcases/clientreadertestcase.py @@ -117,6 +117,15 @@ class JailReaderTest(LogCaptureTestCase): self.assertTrue(self._is_logged('No filter set for jail emptyaction')) self.assertTrue(self._is_logged('No actions were defined for emptyaction')) + def testJailActionFilterMissing(self): + jail = JailReader('missingbitsjail', basedir=os.path.join('testcases','config')) + self.assertTrue(jail.read()) + self.assertFalse(jail.getOptions()) + self.assertTrue(jail.isEnabled()) + #print self._log.getvalue() + self.assertTrue(self._is_logged("Found no accessible config files for 'filter.d/catchallthebadies' under testcases/config")) + self.assertTrue(self._is_logged('Unable to read the filter')) + def testJailActionBrokenDef(self): jail = JailReader('brokenactiondef', basedir=os.path.join('testcases','config')) self.assertTrue(jail.read()) diff --git a/testcases/config/jail.conf b/testcases/config/jail.conf index 419e2e2c..4bdd74cf 100644 --- a/testcases/config/jail.conf +++ b/testcases/config/jail.conf @@ -15,6 +15,6 @@ action = joho[foo enabled = true action = brokenaction -[missingaction] -enabled = true +[missingbitsjail] +filter = catchallthebadies action = thefunkychickendance