From d33b0a4dac9842af98662b78a8b37620c622ecbf Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 3 Oct 2012 16:22:36 -0400 Subject: testsuite: tried to fix a broken test --- .../TestPlugins/TestCfg/TestCfgEncryptedCheetahGenerator.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'testsuite/Testsrc/Testlib/TestServer') 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 -- cgit v1.2.3-1-g7c22