From 48dea2ea0ce93b80484abac6875da4fdf5a20ce7 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Thu, 8 Aug 2013 15:35:23 -0400 Subject: testsuite: fixed unit tests for server plugins --- .../Testsrc/Testlib/TestServer/TestPlugins/TestRules.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestRules.py') diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestRules.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestRules.py index 7083fff06..0bd69b371 100644 --- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestRules.py +++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestRules.py @@ -21,6 +21,10 @@ from TestPlugin import TestPrioDir class TestRules(TestPrioDir): test_obj = Rules + def setUp(self): + TestPrioDir.setUp(self) + set_setup_default("rules_regex", False) + def test_HandlesEntry(self): r = self.get_obj() r.Entries = dict(Path={"/etc/foo.conf": Mock(), @@ -76,11 +80,3 @@ class TestRules(TestPrioDir): self.assertTrue(r._matches(entry, metadata, candidate)) mock_matches.assert_called_with(r, entry, metadata, candidate) self.assertIn("/etc/.*\.conf", r._regex_cache.keys()) - - def test__regex_enabled(self): - r = self.get_obj() - r.core.setup = MagicMock() - self.assertEqual(r._regex_enabled, - r.core.setup.cfp.getboolean.return_value) - r.core.setup.cfp.getboolean.assert_called_with("rules", "regex", - default=False) -- cgit v1.2.3-1-g7c22