diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-10-03 12:42:16 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-10-03 12:44:26 -0400 |
| commit | 1ea86e8f1d59b1c770ee8ae901d221adbbe9c1df (patch) | |
| tree | f76cb3005e2d1f09dc44401165dd39944f300de8 /testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg | |
| parent | 4ec0e0451013172627fe491b7824cdd218317ee7 (diff) | |
| download | bcfg2-1ea86e8f1d59b1c770ee8ae901d221adbbe9c1df.tar.gz bcfg2-1ea86e8f1d59b1c770ee8ae901d221adbbe9c1df.tar.bz2 bcfg2-1ea86e8f1d59b1c770ee8ae901d221adbbe9c1df.zip | |
testsuite: fixed some assorted tests
Diffstat (limited to 'testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg')
2 files changed, 5 insertions, 3 deletions
diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedCheetahGenerator.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedCheetahGenerator.py index 0522b9206..c969cdfb7 100644 --- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedCheetahGenerator.py +++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedCheetahGenerator.py @@ -19,7 +19,7 @@ from common import XI_NAMESPACE, XI, inPy3k, call, builtins, u, can_skip, \ try: from TestServer.TestPlugins.TestCfg.TestCfgCheetahGenerator import \ TestCfgCheetahGenerator - HAS_CHEETAH = True + from Bcfg2.Server.Plugins.Cfg.CfgCheetahGenerator import HAS_CHEETAH except ImportError: TestCfgCheetahGenerator = object HAS_CHEETAH = False diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedGenerator.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedGenerator.py index d8819b11c..7e4a64996 100644 --- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedGenerator.py +++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedGenerator.py @@ -28,8 +28,10 @@ if can_skip or HAS_CRYPTO: def setUp(self): pass - @patch("Bcfg2.Server.Plugins.Cfg.CfgEncryptedGenerator.get_algorithm") - @patch("Bcfg2.Server.Plugins.Cfg.CfgEncryptedGenerator.bruteforce_decrypt") + @patchIf(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.CfgGenerator.handle_event") def inner(mock_handle_event): |