diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-22 15:31:11 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-22 15:31:11 -0400 |
| commit | fecf05988cac14676650bcaa22630ec321680cab (patch) | |
| tree | c11fb5c7d983929055688f8b7aeeea8027cc455e /testsuite/Testlib/TestServer | |
| parent | 2b898c094a88f99e987f48a7d116d4a6009b456c (diff) | |
| download | bcfg2-fecf05988cac14676650bcaa22630ec321680cab.tar.gz bcfg2-fecf05988cac14676650bcaa22630ec321680cab.tar.bz2 bcfg2-fecf05988cac14676650bcaa22630ec321680cab.zip | |
fixed imports from test common
Diffstat (limited to 'testsuite/Testlib/TestServer')
| -rw-r--r-- | testsuite/Testlib/TestServer/TestPlugin.py | 3 | ||||
| -rw-r--r-- | testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py | 3 | ||||
| -rw-r--r-- | testsuite/Testlib/TestServer/TestPlugins/TestProbes.py | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/testsuite/Testlib/TestServer/TestPlugin.py b/testsuite/Testlib/TestServer/TestPlugin.py index 64cde987e..c42b9f14d 100644 --- a/testsuite/Testlib/TestServer/TestPlugin.py +++ b/testsuite/Testlib/TestServer/TestPlugin.py @@ -10,7 +10,8 @@ from mock import Mock, MagicMock, patch from Bcfg2.Server.Plugin import * # python 2.5 can't import * from relative imports from ...common import XI_NAMESPACE, XI, inPy3k, call, builtins, u, can_skip, \ - skip, skipIf, skipUnless, Bcfg2TestCase, DBModelTestCase, syncdb, patchIf + skip, skipIf, skipUnless, Bcfg2TestCase, DBModelTestCase, syncdb, \ + patchIf, datastore def tostring(el): return lxml.etree.tostring(el, xml_declaration=False).decode('UTF-8') diff --git a/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py b/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py index 29c17a320..c5569c2b6 100644 --- a/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py +++ b/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py @@ -7,7 +7,8 @@ import lxml.etree from mock import Mock, patch # python 2.5 can't import * from relative imports from ....common import XI_NAMESPACE, XI, inPy3k, call, builtins, u, can_skip, \ - skip, skipIf, skipUnless, Bcfg2TestCase, DBModelTestCase, syncdb, patchIf + skip, skipIf, skipUnless, Bcfg2TestCase, DBModelTestCase, syncdb, \ + patchIf, datastore import Bcfg2.Server import Bcfg2.Server.Plugin from Bcfg2.Server.Plugins.Metadata import * diff --git a/testsuite/Testlib/TestServer/TestPlugins/TestProbes.py b/testsuite/Testlib/TestServer/TestPlugins/TestProbes.py index cd489d5f0..3457444b2 100644 --- a/testsuite/Testlib/TestServer/TestPlugins/TestProbes.py +++ b/testsuite/Testlib/TestServer/TestPlugins/TestProbes.py @@ -5,7 +5,8 @@ import lxml.etree from mock import Mock, MagicMock, patch # python 2.5 can't import * from relative imports from ....common import XI_NAMESPACE, XI, inPy3k, call, builtins, u, can_skip, \ - skip, skipIf, skipUnless, Bcfg2TestCase, DBModelTestCase, syncdb, patchIf + skip, skipIf, skipUnless, Bcfg2TestCase, DBModelTestCase, syncdb, \ + patchIf, datastore import Bcfg2.Server import Bcfg2.Server.Plugin from Bcfg2.Server.Plugins.Probes import * |