summaryrefslogtreecommitdiffstats
path: root/testsuite
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-01-29 08:39:11 -0500
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-01-29 08:39:11 -0500
commite74a45e719cbb5445720a32c8a3ec41b306e2667 (patch)
treeabd1f02903e4e9a8fd8f2e87a45630b97106a08c /testsuite
parent257dff5cbe26a111b719201a0031da39a34b0fe0 (diff)
downloadbcfg2-e74a45e719cbb5445720a32c8a3ec41b306e2667.tar.gz
bcfg2-e74a45e719cbb5445720a32c8a3ec41b306e2667.tar.bz2
bcfg2-e74a45e719cbb5445720a32c8a3ec41b306e2667.zip
fixed unit tests
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestTemplateHelper.py15
1 files changed, 10 insertions, 5 deletions
diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestTemplateHelper.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestTemplateHelper.py
index 43d594482..bf9a3ced3 100644
--- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestTemplateHelper.py
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestTemplateHelper.py
@@ -39,7 +39,8 @@ class TestHelperModule(Bcfg2TestCase):
mock_load_source.side_effect = ImportError
attrs = dir(hm)
hm.HandleEvent()
- mock_load_source.assert_called_with(hm._module_name, hm.name)
+ mock_load_source.assert_called_with(safe_module_name(hm._module_name),
+ hm.name)
self.assertEqual(attrs, dir(hm))
self.assertEqual(hm._attrs, [])
@@ -50,7 +51,8 @@ class TestHelperModule(Bcfg2TestCase):
mock_load_source.return_value = Mock()
attrs = dir(hm)
hm.HandleEvent()
- mock_load_source.assert_called_with(hm._module_name, hm.name)
+ mock_load_source.assert_called_with(safe_module_name(hm._module_name),
+ hm.name)
self.assertEqual(attrs, dir(hm))
self.assertEqual(hm._attrs, [])
@@ -61,7 +63,8 @@ class TestHelperModule(Bcfg2TestCase):
mock_load_source.return_value = module
attrs = dir(hm)
hm.HandleEvent()
- mock_load_source.assert_called_with(hm._module_name, hm.name)
+ mock_load_source.assert_called_with(safe_module_name(hm._module_name),
+ hm.name)
self.assertEqual(attrs, dir(hm))
self.assertEqual(hm._attrs, [])
@@ -71,7 +74,8 @@ class TestHelperModule(Bcfg2TestCase):
mock_load_source.reset()
mock_load_source.return_value = module
hm.HandleEvent()
- mock_load_source.assert_called_with(hm._module_name, hm.name)
+ mock_load_source.assert_called_with(safe_module_name(hm._module_name),
+ hm.name)
self.assertTrue(hasattr(hm, "foo"))
self.assertTrue(hasattr(hm, "bar"))
self.assertTrue(hasattr(hm, "baz"))
@@ -83,7 +87,8 @@ class TestHelperModule(Bcfg2TestCase):
mock_load_source.reset()
mock_load_source.return_value = module
hm.HandleEvent()
- mock_load_source.assert_called_with(hm._module_name, hm.name)
+ mock_load_source.assert_called_with(safe_module_name(hm._module_name),
+ hm.name)
self.assertTrue(hasattr(hm, "foo"))
self.assertTrue(hasattr(hm, "bar"))
self.assertTrue(hasattr(hm, "quux"))