From c6d14dcf0eedef9513b3b5fb5b028ff301908734 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 12 Dec 2013 20:35:30 +0000 Subject: [PATCH] TST: complete coverage of splitAction --- client/jailreader.py | 2 +- testcases/clientreadertestcase.py | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/client/jailreader.py b/client/jailreader.py index 2138acee..131a4dd5 100644 --- a/client/jailreader.py +++ b/client/jailreader.py @@ -180,7 +180,7 @@ class JailReader(ConfigReader): "2 groups. Got: 0" % action) if len(mgroups) == 2: action_name, action_opts = mgroups - elif len(mgroups) == 1: + elif len(mgroups) == 1: # pragma: nocover - unreachable - .* on second group always matches action_name, action_opts = mgroups[0], None else: # pragma: nocover - unreachable - regex only can capture 2 groups raise ValueError("While reading action %s we should have got up to " diff --git a/testcases/clientreadertestcase.py b/testcases/clientreadertestcase.py index 0937a5a5..c22f028a 100644 --- a/testcases/clientreadertestcase.py +++ b/testcases/clientreadertestcase.py @@ -123,7 +123,19 @@ class JailReaderTest(LogCaptureTestCase): expected = ['mail-whois', {'name': 'SSH'}] result = JailReader.splitAction(action) self.assertEqual(expected, result) + + self.assertEqual(['mail.who_is', {}], JailReader.splitAction("mail.who_is")) + self.assertEqual(['mail.who_is', {'a':'cat', 'b':'dog'}], JailReader.splitAction("mail.who_is[a=cat,b=dog]")) + self.assertEqual(['mail--ho_is', {}], JailReader.splitAction("mail--ho_is")) + + self.assertEqual(['mail--ho_is', {}], JailReader.splitAction("mail--ho_is['s']")) + self.assertTrue(self._is_logged("Invalid argument ['s'] in ''s''")) + + self.assertEqual(['mail', {'a': ','}], JailReader.splitAction("mail[a=',']")) + self.assertRaises(ValueError, JailReader.splitAction ,'mail-how[') + + def testGlob(self): d = tempfile.mkdtemp(prefix="f2b-temp") # Generate few files