1 files changed, 21 insertions, 12 deletions
diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestTemplateHelper.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestTemplateHelper.py
index 128d6cae5..a470dca67 100644
--- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestTemplateHelper.py
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestTemplateHelper.py
@@ -2,6 +2,7 @@ import os
 import sys
 import Bcfg2.Server.Plugin
 from mock import Mock, MagicMock, patch
+from Bcfg2.Utils import safe_module_name
 from Bcfg2.Server.Plugins.TemplateHelper import *
 
 # add all parent testsuite directories to sys.path to allow (most)
@@ -22,10 +23,13 @@ class TestHelperModule(Bcfg2TestCase):
     test_obj = HelperModule
     path = os.path.join(datastore, "test.py")
 
-    def get_obj(self, path=None):
+    def get_obj(self, path=None, core=None):
         if path is None:
             path = self.path
-        return self.test_obj(path)
+        if core is None:
+            core = Mock()
+            core.metadata_cache_mode = 'none'
+        return self.test_obj(path, core)
 
     def test__init(self):
         hm = self.get_obj()
@@ -39,8 +43,9 @@ class TestHelperModule(Bcfg2TestCase):
         mock_load_source.side_effect = ImportError
         attrs = dir(hm)
         hm.HandleEvent()
-        mock_load_source.assert_called_with(safe_module_name(hm._module_name),
-                                            hm.name)
+        mock_load_source.assert_called_with(
+            safe_module_name('TemplateHelper', hm._module_name),
+            hm.name)
         self.assertEqual(attrs, dir(hm))
         self.assertEqual(hm._attrs, [])
 
@@ -51,8 +56,9 @@ class TestHelperModule(Bcfg2TestCase):
         mock_load_source.return_value = Mock()
         attrs = dir(hm)
         hm.HandleEvent()
-        mock_load_source.assert_called_with(safe_module_name(hm._module_name),
-                                            hm.name)
+        mock_load_source.assert_called_with(
+            safe_module_name('TemplateHelper', hm._module_name),
+            hm.name)
         self.assertEqual(attrs, dir(hm))
         self.assertEqual(hm._attrs, [])
 
@@ -63,8 +69,9 @@ class TestHelperModule(Bcfg2TestCase):
         mock_load_source.return_value = module
         attrs = dir(hm)
         hm.HandleEvent()
-        mock_load_source.assert_called_with(safe_module_name(hm._module_name),
-                                            hm.name)
+        mock_load_source.assert_called_with(
+            safe_module_name('TemplateHelper', hm._module_name),
+            hm.name)
         self.assertEqual(attrs, dir(hm))
         self.assertEqual(hm._attrs, [])
 
@@ -74,8 +81,9 @@ class TestHelperModule(Bcfg2TestCase):
         mock_load_source.reset()
         mock_load_source.return_value = module
         hm.HandleEvent()
-        mock_load_source.assert_called_with(safe_module_name(hm._module_name),
-                                            hm.name)
+        mock_load_source.assert_called_with(
+            safe_module_name('TemplateHelper', hm._module_name),
+            hm.name)
         self.assertTrue(hasattr(hm, "foo"))
         self.assertTrue(hasattr(hm, "bar"))
         self.assertTrue(hasattr(hm, "baz"))
@@ -87,8 +95,9 @@ class TestHelperModule(Bcfg2TestCase):
         mock_load_source.reset()
         mock_load_source.return_value = module
         hm.HandleEvent()
-        mock_load_source.assert_called_with(safe_module_name(hm._module_name),
-                                            hm.name)
+        mock_load_source.assert_called_with(
+            safe_module_name('TemplateHelper', hm._module_name),
+            hm.name)
         self.assertTrue(hasattr(hm, "foo"))
         self.assertTrue(hasattr(hm, "bar"))
         self.assertTrue(hasattr(hm, "quux"))