diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-10-03 16:22:36 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-10-03 16:22:36 -0400 |
commit | d33b0a4dac9842af98662b78a8b37620c622ecbf (patch) | |
tree | 72a8281fc09a458aa81bf98457980d8ab6787324 /testsuite | |
parent | 3a16a7cb5a7c4142890af4b32841e15dbaa40556 (diff) | |
download | bcfg2-d33b0a4dac9842af98662b78a8b37620c622ecbf.tar.gz bcfg2-d33b0a4dac9842af98662b78a8b37620c622ecbf.tar.bz2 bcfg2-d33b0a4dac9842af98662b78a8b37620c622ecbf.zip |
testsuite: tried to fix a broken test
Diffstat (limited to 'testsuite')
-rw-r--r-- | testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedCheetahGenerator.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedCheetahGenerator.py b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedCheetahGenerator.py index c969cdfb7..539b1e741 100644 --- a/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedCheetahGenerator.py +++ b/testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedCheetahGenerator.py @@ -1,6 +1,5 @@ import os import sys -from mock import Mock, MagicMock, patch from Bcfg2.Server.Plugins.Cfg.CfgEncryptedCheetahGenerator import * # add all parent testsuite directories to sys.path to allow (most) @@ -12,9 +11,7 @@ while path != "/": if os.path.basename(path) == "testsuite": break path = os.path.dirname(path) -from common import XI_NAMESPACE, XI, inPy3k, call, builtins, u, can_skip, \ - skip, skipIf, skipUnless, Bcfg2TestCase, DBModelTestCase, syncdb, \ - patchIf, datastore, re_type +from common import can_skip, skipUnless try: from TestServer.TestPlugins.TestCfg.TestCfgCheetahGenerator import \ @@ -27,7 +24,7 @@ except ImportError: try: from TestServer.TestPlugins.TestCfg.TestCfgEncryptedGenerator import \ TestCfgEncryptedGenerator - HAS_CRYPTO = True + from Bcfg2.Server.Plugins.Cfg.CfgEncryptedGenerator import HAS_CRYPTO except ImportError: TestCfgEncryptedGenerator = object HAS_CRYPTO = False |