Merge branch 'maint'

Conflicts:
	doc/server/plugins/generators/cfg.txt
	doc/server/plugins/generators/tcheetah.txt
	src/lib/Bcfg2/Server/Admin/Xcmd.py
	src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
	src/lib/Bcfg2/Server/Plugins/Packages/Yum.py

1 files changed, 19 insertions, 18 deletions

diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testbase.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testbase.py
index 318f5ceaa..e26c26d41 100644
--- a/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testbase.py
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testbase.py
@@ -80,24 +80,25 @@ class TestPlugin(TestDebuggable):
     @patch("os.makedirs")
     @patch("os.path.exists")
     def test__init(self, mock_exists, mock_makedirs):
-        core = Mock()
-        core.setup = MagicMock()
-
-        mock_exists.return_value = True
-        p = self.get_obj(core=core)
-        self.assertEqual(p.data, os.path.join(datastore, p.name))
-        self.assertEqual(p.core, core)
-        mock_exists.assert_any_call(p.data)
-        self.assertFalse(mock_makedirs.called)
-
-        mock_exists.reset_mock()
-        mock_makedirs.reset_mock()
-        mock_exists.return_value = False
-        p = self.get_obj(core=core)
-        self.assertEqual(p.data, os.path.join(datastore, p.name))
-        self.assertEqual(p.core, core)
-        mock_exists.assert_any_call(p.data)
-        mock_makedirs.assert_any_call(p.data)
+        if self.test_obj.create:
+            core = Mock()
+            core.setup = MagicMock()
+
+            mock_exists.return_value = True
+            p = self.get_obj(core=core)
+            self.assertEqual(p.data, os.path.join(datastore, p.name))
+            self.assertEqual(p.core, core)
+            mock_exists.assert_any_call(p.data)
+            self.assertFalse(mock_makedirs.called)
+
+            mock_exists.reset_mock()
+            mock_makedirs.reset_mock()
+            mock_exists.return_value = False
+            p = self.get_obj(core=core)
+            self.assertEqual(p.data, os.path.join(datastore, p.name))
+            self.assertEqual(p.core, core)
+            mock_exists.assert_any_call(p.data)
+            mock_makedirs.assert_any_call(p.data)
 
     @patch("os.makedirs")
     def test_init_repo(self, mock_makedirs):