diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-04-25 11:52:15 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-04-25 11:52:15 -0400 |
| commit | d398012d9bd36b1567614a788e3206dcb84753a6 (patch) | |
| tree | 9ea32aa293092e1048457cd57cfb3bcdce9bd4fc | |
| parent | 90748690f8cc617455611bf852077085628cc62c (diff) | |
| download | bcfg2-d398012d9bd36b1567614a788e3206dcb84753a6.tar.gz bcfg2-d398012d9bd36b1567614a788e3206dcb84753a6.tar.bz2 bcfg2-d398012d9bd36b1567614a788e3206dcb84753a6.zip | |
more unit test fixes
3 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Client/__init__.py b/src/lib/Bcfg2/Client/__init__.py index 2461c1316..3da80067d 100644 --- a/src/lib/Bcfg2/Client/__init__.py +++ b/src/lib/Bcfg2/Client/__init__.py @@ -403,7 +403,7 @@ class Client(object): self.config = newconfig if not Bcfg2.Options.setup.no_lock: - #check lock here + # check lock here try: lockfile = open(Bcfg2.Options.setup.lockfile, 'w') if locked(lockfile.fileno()): diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py index bceb7f02b..849c75f70 100644 --- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py +++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py @@ -36,7 +36,6 @@ class CfgEncryptedGenerator(CfgGenerator): self.data = bruteforce_decrypt(self.data) except EVPError: msg = "Cfg: Failed to decrypt %s" % self.name - print("lax decrypt: %s" % Bcfg2.Options.setup.lax_decryption) if Bcfg2.Options.setup.lax_decryption: self.logger.debug(msg) else: diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedGenerator.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedGenerator.py index 7989bf514..63403208b 100644 --- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedGenerator.py +++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedGenerator.py @@ -22,6 +22,10 @@ from TestServer.TestPlugins.TestCfg.Test_init import TestCfgGenerator class TestCfgEncryptedGenerator(TestCfgGenerator): test_obj = CfgEncryptedGenerator + @skipUnless(HAS_CRYPTO, "M2Crypto is not available") + def setUp(self): + TestCfgGenerator.setUp(self) + @patchIf(HAS_CRYPTO, "Bcfg2.Server.Plugins.Cfg.CfgEncryptedGenerator.bruteforce_decrypt") def test_handle_event(self, mock_decrypt): |