1 files changed, 16 insertions, 10 deletions
diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestTemplateHelper.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestTemplateHelper.py
index 6f5ee18ba..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)
@@ -42,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, [])
 
@@ -54,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, [])
 
@@ -66,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, [])
 
@@ -77,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"))
@@ -90,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"))