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, 94 insertions, 108 deletions

diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgGenshiGenerator.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgGenshiGenerator.py
index 385f8df77..154d6a8db 100644
--- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgGenshiGenerator.py
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgGenshiGenerator.py
@@ -18,111 +18,97 @@ from common import *
 from TestServer.TestPlugins.TestCfg.Test_init import TestCfgGenerator
 
 
-if can_skip or HAS_GENSHI:
-    class TestCfgGenshiGenerator(TestCfgGenerator):
-        test_obj = CfgGenshiGenerator
-
-        @skipUnless(HAS_GENSHI, "Genshi libraries not found, skipping")
-        def setUp(self):
-            pass
-
-        def test_removecomment(self):
-            data = [(None, "test", 1),
-                    (None, "test2", 2)]
-            stream = [(genshi.core.COMMENT, "test", 0),
-                      data[0],
-                      (genshi.core.COMMENT, "test3", 0),
-                      data[1]]
-            self.assertItemsEqual(list(removecomment(stream)), data)
-
-        def test__init(self):
-            TestCfgGenerator.test__init(self)
-            cgg = self.get_obj()
-            self.assertIsInstance(cgg.loader, cgg.__loader_cls__)
-
-        def test_get_data(self):
-            cgg = self.get_obj()
-            cgg._handle_genshi_exception = Mock()
-            cgg.template = Mock()
-            fltr = Mock()
-            cgg.template.generate.return_value = fltr
-            stream = Mock()
-            fltr.filter.return_value = stream
-            entry = lxml.etree.Element("Path", name="/test.txt")
-            metadata = Mock()
-
-            Bcfg2.Server.Plugins.Cfg.CfgGenshiGenerator.SETUP = MagicMock()
-
-            def reset():
-                cgg.template.reset_mock()
-                cgg._handle_genshi_exception.reset_mock()
-                Bcfg2.Server.Plugins.Cfg.CfgGenshiGenerator.SETUP.reset_mock()
-
-            template_vars = dict(
-                name=entry.get("name"),
-                metadata=metadata,
-                path=cgg.name,
-                source_path=cgg.name,
-                repo=Bcfg2.Server.Plugins.Cfg.CfgGenshiGenerator.SETUP.__getitem__.return_value)
-
-            self.assertEqual(cgg.get_data(entry, metadata),
-                             stream.render.return_value)
-            cgg.template.generate.assert_called_with(**template_vars)
-            Bcfg2.Server.Plugins.Cfg.CfgGenshiGenerator.SETUP.__getitem__.assert_called_with("repo")
-            fltr.filter.assert_called_with(removecomment)
-            stream.render.assert_called_with("text", encoding=cgg.encoding,
-                                             strip_whitespace=False)
-
-            reset()
-            def render(fmt, **kwargs):
-                stream.render.side_effect = None
-                raise TypeError
-            stream.render.side_effect = render
-            self.assertEqual(cgg.get_data(entry, metadata),
-                             stream.render.return_value)
-            cgg.template.generate.assert_called_with(**template_vars)
-            Bcfg2.Server.Plugins.Cfg.CfgGenshiGenerator.SETUP.__getitem__.assert_called_with("repo")
-            fltr.filter.assert_called_with(removecomment)
-            self.assertEqual(stream.render.call_args_list,
-                             [call("text", encoding=cgg.encoding,
-                                  strip_whitespace=False),
-                              call("text", encoding=cgg.encoding)])
-
-            reset()
-            stream.render.side_effect = UndefinedError("test")
-            self.assertRaises(UndefinedError,
-                              cgg.get_data, entry, metadata)
-            cgg.template.generate.assert_called_with(**template_vars)
-            Bcfg2.Server.Plugins.Cfg.CfgGenshiGenerator.SETUP.__getitem__.assert_called_with("repo")
-            fltr.filter.assert_called_with(removecomment)
-            stream.render.assert_called_with("text", encoding=cgg.encoding,
-                                             strip_whitespace=False)
-
-            reset()
-            stream.render.side_effect = ValueError
-            cgg._handle_genshi_exception.side_effect = ValueError
-            self.assertRaises(ValueError,
-                              cgg.get_data, entry, metadata)
-            cgg.template.generate.assert_called_with(**template_vars)
-            Bcfg2.Server.Plugins.Cfg.CfgGenshiGenerator.SETUP.__getitem__.assert_called_with("repo")
-            fltr.filter.assert_called_with(removecomment)
-            stream.render.assert_called_with("text", encoding=cgg.encoding,
-                                             strip_whitespace=False)
-            self.assertTrue(cgg._handle_genshi_exception.called)
-
-        def test_handle_event(self):
-            cgg = self.get_obj()
-            cgg.loader = Mock()
-            event = Mock()
-            cgg.handle_event(event)
-            cgg.loader.load.assert_called_with(cgg.name,
-                                               cls=NewTextTemplate,
-                                               encoding=cgg.encoding)
-
-            cgg.loader.reset_mock()
-            cgg.loader.load.side_effect = OSError
-            self.assertRaises(PluginExecutionError,
-                              cgg.handle_event, event)
-            cgg.loader.load.assert_called_with(cgg.name,
-                                               cls=NewTextTemplate,
-                                               encoding=cgg.encoding)
+class TestCfgGenshiGenerator(TestCfgGenerator):
+    test_obj = CfgGenshiGenerator
+
+    def test__init(self):
+        TestCfgGenerator.test__init(self)
+        cgg = self.get_obj()
+        self.assertIsInstance(cgg.loader, cgg.__loader_cls__)
+
+    def test_get_data(self):
+        cgg = self.get_obj()
+        cgg._handle_genshi_exception = Mock()
+        cgg.setup = MagicMock()
+        cgg.template = Mock()
+        fltr = Mock()
+        cgg.template.generate.return_value = fltr
+        stream = Mock()
+        fltr.filter.return_value = stream
+        entry = lxml.etree.Element("Path", name="/test.txt")
+        metadata = Mock()
+
+
+        def reset():
+            cgg.template.reset_mock()
+            cgg._handle_genshi_exception.reset_mock()
+            cgg.setup.reset_mock()
+
+        template_vars = dict(
+            name=entry.get("name"),
+            metadata=metadata,
+            path=cgg.name,
+            source_path=cgg.name,
+            repo=cgg.setup.__getitem__.return_value)
+
+        self.assertEqual(cgg.get_data(entry, metadata),
+                         stream.render.return_value)
+        cgg.template.generate.assert_called_with(**template_vars)
+        cgg.setup.__getitem__.assert_called_with("repo")
+        fltr.filter.assert_called_with(removecomment)
+        stream.render.assert_called_with("text", encoding=cgg.encoding,
+                                         strip_whitespace=False)
+
+        reset()
+        def render(fmt, **kwargs):
+            stream.render.side_effect = None
+            raise TypeError
+        stream.render.side_effect = render
+        self.assertEqual(cgg.get_data(entry, metadata),
+                         stream.render.return_value)
+        cgg.template.generate.assert_called_with(**template_vars)
+        cgg.setup.__getitem__.assert_called_with("repo")
+        fltr.filter.assert_called_with(removecomment)
+        self.assertEqual(stream.render.call_args_list,
+                         [call("text", encoding=cgg.encoding,
+                              strip_whitespace=False),
+                          call("text", encoding=cgg.encoding)])
+
+        reset()
+        stream.render.side_effect = UndefinedError("test")
+        self.assertRaises(UndefinedError,
+                          cgg.get_data, entry, metadata)
+        cgg.template.generate.assert_called_with(**template_vars)
+        cgg.setup.__getitem__.assert_called_with("repo")
+        fltr.filter.assert_called_with(removecomment)
+        stream.render.assert_called_with("text", encoding=cgg.encoding,
+                                         strip_whitespace=False)
+
+        reset()
+        stream.render.side_effect = ValueError
+        cgg._handle_genshi_exception.side_effect = ValueError
+        self.assertRaises(ValueError,
+                          cgg.get_data, entry, metadata)
+        cgg.template.generate.assert_called_with(**template_vars)
+        cgg.setup.__getitem__.assert_called_with("repo")
+        fltr.filter.assert_called_with(removecomment)
+        stream.render.assert_called_with("text", encoding=cgg.encoding,
+                                         strip_whitespace=False)
+        self.assertTrue(cgg._handle_genshi_exception.called)
+
+    def test_handle_event(self):
+        cgg = self.get_obj()
+        cgg.loader = Mock()
+        event = Mock()
+        cgg.handle_event(event)
+        cgg.loader.load.assert_called_with(cgg.name,
+                                           cls=NewTextTemplate,
+                                           encoding=cgg.encoding)
+
+        cgg.loader.reset_mock()
+        cgg.loader.load.side_effect = OSError
+        self.assertRaises(PluginExecutionError,
+                          cgg.handle_event, event)
+        cgg.loader.load.assert_called_with(cgg.name,
+                                           cls=NewTextTemplate,
+                                           encoding=cgg.encoding)