summaryrefslogtreecommitdiffstats
path: root/testsuite/Testsrc/Testlib/TestServer
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2014-04-25 11:52:15 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2014-04-25 11:52:15 -0400
commitd398012d9bd36b1567614a788e3206dcb84753a6 (patch)
tree9ea32aa293092e1048457cd57cfb3bcdce9bd4fc /testsuite/Testsrc/Testlib/TestServer
parent90748690f8cc617455611bf852077085628cc62c (diff)
downloadbcfg2-d398012d9bd36b1567614a788e3206dcb84753a6.tar.gz
bcfg2-d398012d9bd36b1567614a788e3206dcb84753a6.tar.bz2
bcfg2-d398012d9bd36b1567614a788e3206dcb84753a6.zip
more unit test fixes
Diffstat (limited to 'testsuite/Testsrc/Testlib/TestServer')
-rw-r--r--testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedGenerator.py4
1 files changed, 4 insertions, 0 deletions
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):