From 1ea86e8f1d59b1c770ee8ae901d221adbbe9c1df Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 3 Oct 2012 12:42:16 -0400 Subject: testsuite: fixed some assorted tests --- .../TestPlugins/TestCfg/TestCfgEncryptedCheetahGenerator.py | 2 +- .../TestServer/TestPlugins/TestCfg/TestCfgEncryptedGenerator.py | 6 ++++-- testsuite/Testsrc/test_code_checks.py | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'testsuite/Testsrc') 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): diff --git a/testsuite/Testsrc/test_code_checks.py b/testsuite/Testsrc/test_code_checks.py index eb7892ef3..76f84912a 100644 --- a/testsuite/Testsrc/test_code_checks.py +++ b/testsuite/Testsrc/test_code_checks.py @@ -263,7 +263,7 @@ class TestPylint(Bcfg2TestCase): rv = pylint.wait() for line in output.splitlines(): - if self.error_re.search(line): + if self.error_re.search(str(line)): print(line) # pylint returns a bitmask, where 1 means fatal errors # were encountered and 2 means errors were encountered. -- cgit v1.2.3-1-g7c22