Merge branch 'maint'

Conflicts:
	src/lib/Bcfg2/Server/Plugins/Cfg/CfgPublicKeyCreator.py
	testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgPrivateKeyCreator.py

1 files changed, 2 insertions, 18 deletions

diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgPrivateKeyCreator.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgPrivateKeyCreator.py
index 2967a23b6..d64bbaabf 100644
--- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgPrivateKeyCreator.py
+++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgPrivateKeyCreator.py
@@ -29,6 +29,7 @@ class TestCfgPrivateKeyCreator(TestXMLCfgCreator):
     test_obj = CfgPrivateKeyCreator
     should_monitor = False
 
+    @patch("Bcfg2.Server.Plugins.Cfg.CfgPublicKeyCreator.get_cfg", Mock())
     def get_obj(self, name=None, fam=None):
         return TestXMLCfgCreator.get_obj(self, name=name)
 
@@ -122,28 +123,11 @@ class TestCfgPrivateKeyCreator(TestXMLCfgCreator):
         pkc.XMLMatch.assert_called_with(metadata)
         pkc.get_specificity.assert_called_with(metadata)
         pkc._gen_keypair.assert_called_with(metadata,
- pkc.XMLMatch.return_value)
-        self.assertItemsEqual(mock_open.call_args_list,
-                              [call(privkey + ".pub"), call(privkey)])
-        pkc.pubkey_creator.get_filename.assert_called_with(group="foo")
-        pkc.pubkey_creator.write_data.assert_called_with(
-            "ssh-rsa publickey pubkey.filename\n", group="foo")
-        pkc.write_data.assert_called_with("privatekey", group="foo")
-        mock_rmtree.assert_called_with(datastore)
-
-        reset()
-        self.assertEqual(pkc.create_data(entry, metadata, return_pair=True),
-                         ("ssh-rsa publickey pubkey.filename\n",
-                          "privatekey"))
-        pkc.XMLMatch.assert_called_with(metadata)
-        pkc.get_specificity.assert_called_with(metadata)
-        pkc._gen_keypair.assert_called_with(metadata,
                                             pkc.XMLMatch.return_value)
         self.assertItemsEqual(mock_open.call_args_list,
                               [call(privkey + ".pub"), call(privkey)])
         pkc.pubkey_creator.get_filename.assert_called_with(group="foo")
         pkc.pubkey_creator.write_data.assert_called_with(
-            "ssh-rsa publickey pubkey.filename\n",
-            group="foo")
+            "ssh-rsa publickey pubkey.filename\n", group="foo")
         pkc.write_data.assert_called_with("privatekey", group="foo")
         mock_rmtree.assert_called_with(datastore)