summaryrefslogtreecommitdiffstats
path: root/testsuite/Testlib/TestServer/TestPlugins
diff options
context:
space:
mode:
Diffstat (limited to 'testsuite/Testlib/TestServer/TestPlugins')
-rw-r--r--testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py4
-rw-r--r--testsuite/Testlib/TestServer/TestPlugins/TestProbes.py4
2 files changed, 6 insertions, 2 deletions
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 *