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, 60 insertions, 0 deletions

diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestDecisions.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestDecisions.py
new file mode 100644
index 000000000..537ceb4ff
--- /dev/null
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestDecisions.py
@@ -0,0 +1,60 @@
+import os
+import sys
+import lxml.etree
+from mock import Mock, MagicMock, patch
+from Bcfg2.Server.Plugins.Decisions import *
+
+# add all parent testsuite directories to sys.path to allow (most)
+# relative imports in python 2.4
+path = os.path.dirname(__file__)
+while path != "/":
+    if os.path.basename(path).lower().startswith("test"):
+        sys.path.append(path)
+    if os.path.basename(path) == "testsuite":
+        break
+    path = os.path.dirname(path)
+from common import *
+from TestPlugin import TestStructFile, TestPlugin, TestDecision
+
+
+class TestDecisionFile(TestStructFile):
+    test_obj = DecisionFile
+
+    def test_get_decisions(self):
+        df = self.get_obj()
+        metadata = Mock()
+
+        df.xdata = None
+        self.assertItemsEqual(df.get_decisions(metadata), [])
+
+        df.xdata = lxml.etree.Element("Decisions")
+        df.XMLMatch = Mock()
+        df.XMLMatch.return_value = lxml.etree.Element("Decisions")
+        lxml.etree.SubElement(df.XMLMatch.return_value,
+                              "Decision", type="Service", name='*')
+        lxml.etree.SubElement(df.XMLMatch.return_value,
+                              "Decision", type="Path",
+                              name='/etc/apt/apt.conf')
+
+        self.assertItemsEqual(df.get_decisions(metadata),
+                              [("Service", '*'),
+                               ("Path", '/etc/apt/apt.conf')])
+        df.XMLMatch.assert_called_with(metadata)
+
+
+class TestDecisions(TestPlugin, TestDecision):
+    test_obj = Decisions
+
+    def test_GetDecisions(self):
+        d = self.get_obj()
+        d.whitelist = Mock()
+        d.blacklist = Mock()
+        metadata = Mock()
+
+        self.assertEqual(d.GetDecisions(metadata, "whitelist"),
+                         d.whitelist.get_decision.return_value)
+        d.whitelist.get_decision.assert_called_with(metadata)
+
+        self.assertEqual(d.GetDecisions(metadata, "blacklist"),
+                         d.blacklist.get_decision.return_value)
+        d.blacklist.get_decision.assert_called_with(metadata)