Merge branch '1.4.x'

Conflicts:
	debian/bcfg2-server.install
	doc/server/plugins/grouping/metadata.txt
	src/lib/Bcfg2/Client/Client.py
	src/lib/Bcfg2/Client/Tools/Portage.py
	src/lib/Bcfg2/Client/Tools/RcUpdate.py
	src/lib/Bcfg2/Client/Tools/YUM24.py
	src/lib/Bcfg2/Client/Tools/__init__.py
	src/lib/Bcfg2/Client/Tools/launchd.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/lib/Bcfg2/Server/Plugins/Metadata.py
	src/lib/Bcfg2/Server/models.py
	src/lib/Bcfg2/Utils.py
	src/sbin/bcfg2-info
	src/sbin/bcfg2-test
	testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py
	testsuite/Testsrc/test_code_checks.py

1 files changed, 19 insertions, 63 deletions

diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestRules.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestRules.py
index f018b45dc..7083fff06 100644
--- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestRules.py
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestRules.py
@@ -45,81 +45,37 @@ class TestRules(TestPrioDir):
         entry = lxml.etree.Element("Package", name="foo")
         self.assertFalse(r.HandlesEntry(entry, metadata))
 
-    def test_BindEntry(self, method="BindEntry"):
-        r = self.get_obj()
-        r.get_attrs = Mock()
-        r.get_attrs.return_value = dict(overwrite="new", add="add",
-                                        text="text")
-        entry = lxml.etree.Element("Test", overwrite="old", keep="keep")
-        metadata = Mock()
-
-        getattr(r, method)(entry, metadata)
-        r.get_attrs.assert_called_with(entry, metadata)
-        self.assertItemsEqual(entry.attrib,
-                              dict(overwrite="old", add="add", keep="keep",
-                                   text="text"))
-
-    def test_HandleEntry(self):
-        self.test_BindEntry(method="HandleEntry")
-
     @patch("Bcfg2.Server.Plugin.PrioDir._matches")
     def test__matches(self, mock_matches):
-        """ test _matches() behavior regardless of state of _regex_enabled """
         r = self.get_obj()
         metadata = Mock()
 
+        # test parent _matches() returning True
         entry = lxml.etree.Element("Path", name="/etc/foo.conf")
-        rules = []
+        candidate = lxml.etree.Element("Path", name="/etc/bar.conf")
         mock_matches.return_value = True
-        self.assertTrue(r._matches(entry, metadata, rules))
-        mock_matches.assert_called_with(r, entry, metadata, rules)
+        self.assertTrue(r._matches(entry, metadata, candidate))
+        mock_matches.assert_called_with(r, entry, metadata, candidate)
 
-        # test special Path cases -- adding and removing trailing slash
+        # test all conditions returning False
         mock_matches.reset_mock()
         mock_matches.return_value = False
-        rules = ["/etc/foo/", "/etc/bar"]
-        entry = lxml.etree.Element("Path", name="/etc/foo")
-        self.assertTrue(r._matches(entry, metadata, rules))
-        mock_matches.assert_called_with(r, entry, metadata, rules)
+        self.assertFalse(r._matches(entry, metadata, candidate))
+        mock_matches.assert_called_with(r, entry, metadata, candidate)
 
+        # test special Path cases -- adding and removing trailing slash
         mock_matches.reset_mock()
-        entry = lxml.etree.Element("Path", name="/etc/bar/")
-        self.assertTrue(r._matches(entry, metadata, rules))
-        mock_matches.assert_called_with(r, entry, metadata, rules)
-
-    @patch("Bcfg2.Server.Plugin.PrioDir._matches")
-    def test__matches_regex_disabled(self, mock_matches):
-        """ test failure to match with regex disabled """
-        r = self.get_obj()
-        self.set_regex_enabled(r, False)
-        metadata = Mock()
-        mock_matches.return_value = False
-
-        entry = lxml.etree.Element("Path", name="/etc/foo.conf")
-        rules = []
-        self.assertFalse(r._matches(entry, metadata, rules))
-        mock_matches.assert_called_with(r, entry, metadata, rules)
-
-    @patch("Bcfg2.Server.Plugin.PrioDir._matches")
-    def test__matches_regex_enabled(self, mock_matches):
-        """ test match with regex enabled """
-        r = self.get_obj()
-        self.set_regex_enabled(r, True)
-        metadata = Mock()
-        mock_matches.return_value = False
-
-        entry = lxml.etree.Element("Path", name="/etc/foo.conf")
-        rules = ["/etc/.*\.conf", "/etc/bar"]
-        self.assertTrue(r._matches(entry, metadata, rules))
-        mock_matches.assert_called_with(r, entry, metadata, rules)
-        self.assertIn("/etc/.*\.conf", r._regex_cache.keys())
-
-    def set_regex_enabled(self, rules_obj, state):
-        """ set the state of regex_enabled for this implementation of
-        Rules """
-        if not isinstance(rules_obj.core.setup, MagicMock):
-            rules_obj.core.setup = MagicMock()
-        rules_obj.core.setup.cfp.getboolean.return_value = state
+        withslash = lxml.etree.Element("Path", name="/etc/foo")
+        withoutslash = lxml.etree.Element("Path", name="/etc/foo/")
+        self.assertTrue(r._matches(withslash, metadata, withoutslash))
+        self.assertTrue(r._matches(withoutslash, metadata, withslash))
+
+        if r._regex_enabled:
+            mock_matches.reset_mock()
+            candidate = lxml.etree.Element("Path", name="/etc/.*\.conf")
+            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()