Fix tests to match changes to the Jinja2 code.

2 files changed, 36 insertions, 34 deletions

diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedJinja2Generator.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedJinja2Generator.py
index 281ecb2e7..6857f933b 100644
--- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedJinja2Generator.py
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedJinja2Generator.py
@@ -30,18 +30,17 @@ except ImportError:
     HAS_CRYPTO = False
 
 
-if can_skip or (HAS_CRYPTO and HAS_JINJA2):
-    class TestCfgEncryptedJinja2Generator(TestCfgJinja2Generator,
-                                           TestCfgEncryptedGenerator):
-        test_obj = CfgEncryptedJinja2Generator
+class TestCfgEncryptedJinja2Generator(TestCfgJinja2Generator,
+                                       TestCfgEncryptedGenerator):
+    test_obj = CfgEncryptedJinja2Generator
 
-        @skipUnless(HAS_CRYPTO, "Encryption libraries not found, skipping")
-        @skipUnless(HAS_JINJA2, "Jinja2 libraries not found, skipping")
-        def setUp(self):
-            pass
+    @skipUnless(HAS_CRYPTO, "Encryption libraries not found, skipping")
+    @skipUnless(HAS_JINJA2, "Jinja2 libraries not found, skipping")
+    def setUp(self):
+        pass
 
-        def test_handle_event(self):
-            TestCfgEncryptedGenerator.test_handle_event(self)
+    def test_handle_event(self):
+        TestCfgEncryptedGenerator.test_handle_event(self)
 
-        def test_get_data(self):
-            TestCfgJinja2Generator.test_get_data(self)
+    def test_get_data(self):
+        TestCfgJinja2Generator.test_get_data(self)
diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgJinja2Generator.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgJinja2Generator.py
index 333d6b978..036380d56 100644
--- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgJinja2Generator.py
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgJinja2Generator.py
@@ -17,28 +17,31 @@ from common import *
 from TestServer.TestPlugins.TestCfg.Test_init import TestCfgGenerator
 
 
-if HAS_JINJA2 or can_skip:
-    class TestCfgJinja2Generator(TestCfgGenerator):
-        test_obj = CfgJinja2Generator
+class TestCfgJinja2Generator(TestCfgGenerator):
+    test_obj = CfgJinja2Generator
 
-        @skipUnless(HAS_JINJA2, "Jinja2 libraries not found, skipping")
-        def setUp(self):
-            pass
+    @skipUnless(HAS_JINJA2, "Jinja2 libraries not found, skipping")
+    def setUp(self):
+        TestCfgGenerator.setUp(self)
+        set_setup_default("repository", datastore)
 
-        @patch("Bcfg2.Server.Plugins.Cfg.CfgJinja2Generator.Template")
-        def test_get_data(self, mock_Template):
-            ccg = self.get_obj(encoding='UTF-8')
-            ccg.data = "data"
-            entry = lxml.etree.Element("Path", name="/test.txt")
-            metadata = Mock()
-            Bcfg2.Server.Plugins.Cfg.CfgJinja2Generator.SETUP = MagicMock()
+    @patch("Bcfg2.Server.Plugins.Cfg.CfgJinja2Generator.Template")
+    @patch("Bcfg2.Server.Plugins.Cfg.CfgJinja2Generator.get_template_data")
+    def test_get_data(self, mock_get_template_data, mock_Template):
+        ccg = self.get_obj()
+        ccg.data = "data"
+        entry = lxml.etree.Element("Path", name="/test.txt")
+        metadata = Mock()
 
-            self.assertEqual(ccg.get_data(entry, metadata),
-                             mock_Template.return_value.render.return_value)
-            Bcfg2.Server.Plugins.Cfg.CfgJinja2Generator.SETUP.__getitem__.assert_called_with("repo")
-            mock_Template.assert_called_with("data".decode(ccg.encoding))
-            tmpl = mock_Template.return_value
-            name = entry.get("name")
-            tmpl.render.assert_called_with(metadata=metadata, name=name, path=name,
-                                           source_path=name,
-                                           repo=Bcfg2.Server.Plugins.Cfg.CfgJinja2Generator.SETUP.__getitem__.return_value)
+        template_vars = dict(name=entry.get("name"),
+                             metadata=metadata,
+                             path=ccg.name,
+                             source_path=ccg.name,
+                             repo=datastore)
+        mock_get_template_data.return_value = template_vars
+
+        self.assertEqual(ccg.get_data(entry, metadata),
+                         mock_Template.return_value.render.return_value)
+        mock_Template.assert_called_with("data".decode(Bcfg2.Options.setup.encoding))
+        tmpl = mock_Template.return_value
+        tmpl.render.assert_called_with(template_vars)