diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-22 15:15:43 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-22 15:15:43 -0400 |
commit | 2b898c094a88f99e987f48a7d116d4a6009b456c (patch) | |
tree | 8ed5419373109592dc05398f41e1f8af79b71dd2 /testsuite/Testlib/TestServer | |
parent | a899adb987e3bdce30d7241ad0dc1ff77606f4b9 (diff) | |
download | bcfg2-2b898c094a88f99e987f48a7d116d4a6009b456c.tar.gz bcfg2-2b898c094a88f99e987f48a7d116d4a6009b456c.tar.bz2 bcfg2-2b898c094a88f99e987f48a7d116d4a6009b456c.zip |
tweaked tests for python 2.5
Diffstat (limited to 'testsuite/Testlib/TestServer')
-rw-r--r-- | testsuite/Testlib/TestServer/TestPlugin.py | 4 | ||||
-rw-r--r-- | testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py | 4 | ||||
-rw-r--r-- | testsuite/Testlib/TestServer/TestPlugins/TestProbes.py | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/testsuite/Testlib/TestServer/TestPlugin.py b/testsuite/Testlib/TestServer/TestPlugin.py index d0e840999..64cde987e 100644 --- a/testsuite/Testlib/TestServer/TestPlugin.py +++ b/testsuite/Testlib/TestServer/TestPlugin.py @@ -8,7 +8,9 @@ import Bcfg2.Server from Bcfg2.Bcfg2Py3k import reduce from mock import Mock, MagicMock, patch from Bcfg2.Server.Plugin import * -from ...common 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 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 3eae8fe6b..29c17a320 100644 --- a/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py +++ b/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py @@ -5,7 +5,9 @@ import time import socket import lxml.etree from mock import Mock, patch -from ....common 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 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 1bee16d59..cd489d5f0 100644 --- a/testsuite/Testlib/TestServer/TestPlugins/TestProbes.py +++ b/testsuite/Testlib/TestServer/TestPlugins/TestProbes.py @@ -3,7 +3,9 @@ import sys import time import lxml.etree from mock import Mock, MagicMock, patch -from ....common 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 import Bcfg2.Server import Bcfg2.Server.Plugin from Bcfg2.Server.Plugins.Probes import * |