From c3edef5bd2b55266fee96327f17a093a0fb9cce4 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Fri, 25 Apr 2014 09:10:05 -0400 Subject: testsuite: more unit test fixes --- .../TestCfg/TestCfgEncryptedGenerator.py | 6 +++-- .../TestServer/TestPlugins/TestProperties.py | 30 +--------------------- 2 files changed, 5 insertions(+), 31 deletions(-) (limited to 'testsuite/Testsrc/Testlib/TestServer/TestPlugins') diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedGenerator.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedGenerator.py index 2bfec0e2d..f07994d34 100644 --- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedGenerator.py +++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedGenerator.py @@ -31,7 +31,9 @@ if can_skip or HAS_CRYPTO: "Bcfg2.Server.Plugins.Cfg.CfgEncryptedGenerator.get_algorithm") @patchIf(HAS_CRYPTO, "Bcfg2.Server.Plugins.Cfg.CfgEncryptedGenerator.bruteforce_decrypt") - def test_handle_event(self, mock_decrypt, mock_get_algorithm): + @patch("Bcfg2.Server.Plugins.Cfg.CfgEncryptedGenerator.SETUP") + def test_handle_event(self, mock_SETUP, mock_decrypt, + mock_get_algorithm): @patch("Bcfg2.Server.Plugins.Cfg.CfgGenerator.handle_event") def inner(mock_handle_event): def reset(): @@ -50,7 +52,7 @@ if can_skip or HAS_CRYPTO: mock_handle_event.assert_called_with(ceg, event) mock_decrypt.assert_called_with( "encrypted", - setup=Bcfg2.Server.Plugins.Cfg.SETUP, + setup=mock_SETUP, algorithm=mock_get_algorithm.return_value) self.assertEqual(ceg.data, "plaintext") diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProperties.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProperties.py index 896f5861e..7bdf344b5 100644 --- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProperties.py +++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProperties.py @@ -292,21 +292,18 @@ class TestXMLPropertyFile(TestPropertyFile, TestStructFile): @patchIf(HAS_CRYPTO, "Bcfg2.Encryption.ssl_decrypt") @patchIf(HAS_CRYPTO, "Bcfg2.Encryption.get_algorithm") @patchIf(HAS_CRYPTO, "Bcfg2.Encryption.get_passphrases") - @patchIf(HAS_CRYPTO, "Bcfg2.Encryption.bruteforce_decrypt") - def test_decrypt(self, mock_bruteforce, mock_get_passphrases, + def test_decrypt(self, mock_get_passphrases, mock_get_algorithm, mock_ssl): pf = self.get_obj() Bcfg2.Server.Plugins.Properties.SETUP = MagicMock() def reset(): - mock_bruteforce.reset_mock() mock_get_algorithm.reset_mock() mock_get_passphrases.reset_mock() mock_ssl.reset_mock() # test element without text contents self.assertIsNone(pf._decrypt(lxml.etree.Element("Test"))) - self.assertFalse(mock_bruteforce.called) self.assertFalse(mock_get_passphrases.called) self.assertFalse(mock_ssl.called) @@ -325,7 +322,6 @@ class TestXMLPropertyFile(TestPropertyFile, TestStructFile): Bcfg2.Server.Plugins.Properties.SETUP) mock_ssl.assert_called_with(el.text, "foopass", algorithm="bf_cbc") - self.assertFalse(mock_bruteforce.called) # test failure to decrypt element with a passphrase in the config reset() @@ -337,35 +333,11 @@ class TestXMLPropertyFile(TestPropertyFile, TestStructFile): Bcfg2.Server.Plugins.Properties.SETUP) mock_ssl.assert_called_with(el.text, "foopass", algorithm="bf_cbc") - self.assertFalse(mock_bruteforce.called) # test element without valid passphrase reset() el.set("encrypted", "true") - mock_bruteforce.return_value = "decrypted with bruteforce" - self.assertEqual(pf._decrypt(el), mock_bruteforce.return_value) - mock_get_passphrases.assert_called_with( - Bcfg2.Server.Plugins.Properties.SETUP) - mock_get_algorithm.assert_called_with( - Bcfg2.Server.Plugins.Properties.SETUP) - mock_bruteforce.assert_called_with(el.text, - passphrases=["foopass", - "barpass"], - algorithm="bf_cbc") - self.assertFalse(mock_ssl.called) - - # test failure to decrypt element without valid passphrase - reset() - mock_bruteforce.side_effect = EVPError self.assertRaises(EVPError, pf._decrypt, el) - mock_get_passphrases.assert_called_with( - Bcfg2.Server.Plugins.Properties.SETUP) - mock_get_algorithm.assert_called_with( - Bcfg2.Server.Plugins.Properties.SETUP) - mock_bruteforce.assert_called_with(el.text, - passphrases=["foopass", - "barpass"], - algorithm="bf_cbc") self.assertFalse(mock_ssl.called) @patch("copy.copy") -- cgit v1.2.3-1-g7c22