diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-09-16 12:51:19 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-09-16 12:51:19 -0400 |
| commit | aad2bce56b58efe7d8fd38388b9c2dbdd16f0581 (patch) | |
| tree | b634b3feb2a07c13f1b98c9b10d06c54de12cbd0 /testsuite | |
| parent | b03e1e47c9805332cd83dcc5cf3e68e0b3c8175a (diff) | |
| download | bcfg2-aad2bce56b58efe7d8fd38388b9c2dbdd16f0581.tar.gz bcfg2-aad2bce56b58efe7d8fd38388b9c2dbdd16f0581.tar.bz2 bcfg2-aad2bce56b58efe7d8fd38388b9c2dbdd16f0581.zip | |
testsuite: Fixed CfgPublicKeyCreator tests
Instead of mocking get_filename, use its normal functionality. This
avoids a messy situation where we have to mock out a **magic call,
which py2.5 doesn't like at all.
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgPublicKeyCreator.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgPublicKeyCreator.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgPublicKeyCreator.py index ed529253b..ef4610fae 100644 --- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgPublicKeyCreator.py +++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgPublicKeyCreator.py @@ -50,21 +50,20 @@ class TestCfgPublicKeyCreator(TestCfgCreator, TestStructFile): pkc.cfg = Mock() pkc.core = Mock() pkc.cmd = Mock() - pkc.get_filename = Mock() pkc.write_data = Mock() pubkey = "public key data" privkey_entryset = Mock() privkey_creator = Mock() privkey_creator.get_specificity = Mock() - privkey_creator.get_specificity.return_value = MagicMock() + privkey_creator.get_specificity.return_value = dict() + fileloc = pkc.get_filename() pkc.cfg.entries = {"/home/foo/.ssh/id_rsa": privkey_entryset} def reset(): privkey_creator.reset_mock() pkc.cmd.reset_mock() pkc.core.reset_mock() - pkc.get_filename.reset_mock() pkc.write_data.reset_mock() mock_exists.reset_mock() mock_unlink.reset_mock() @@ -124,7 +123,7 @@ class TestCfgPublicKeyCreator(TestCfgCreator, TestStructFile): privkey_entryset.best_matching.assert_called_with( metadata, privkey_entryset.get_handlers.return_value) - mock_exists.assert_called_with(pkc.get_filename.return_value) + mock_exists.assert_called_with(fileloc) pkc.cmd.run.assert_called_with(["ssh-keygen", "-y", "-f", mock_mkstemp.return_value[1]]) self.assertEqual(pkc.write_data.call_args[0][0], pubkey) @@ -149,7 +148,7 @@ class TestCfgPublicKeyCreator(TestCfgCreator, TestStructFile): privkey_entryset.best_matching.assert_called_with( metadata, privkey_entryset.get_handlers.return_value) - mock_exists.assert_called_with(pkc.get_filename.return_value) - mock_open.assert_called_with(pkc.get_filename.return_value) + mock_exists.assert_called_with(fileloc) + mock_open.assert_called_with(fileloc) self.assertFalse(mock_mkstemp.called) self.assertFalse(pkc.write_data.called) |