summaryrefslogtreecommitdiffstats
path: root/testsuite/Testlib/TestClient
diff options
context:
space:
mode:
Diffstat (limited to 'testsuite/Testlib/TestClient')
-rw-r--r--testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestDevice.py4
-rw-r--r--testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestDirectory.py4
-rw-r--r--testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestFile.py4
-rw-r--r--testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestHardlink.py4
-rw-r--r--testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestNonexistent.py4
-rw-r--r--testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestSymlink.py4
-rw-r--r--testsuite/Testlib/TestClient/TestTools/TestPOSIX/Test__init.py4
-rw-r--r--testsuite/Testlib/TestClient/TestTools/TestPOSIX/Testbase.py4
8 files changed, 24 insertions, 8 deletions
diff --git a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestDevice.py b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestDevice.py
index 2a935fcbc..5b0d0eff0 100644
--- a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestDevice.py
+++ b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestDevice.py
@@ -5,7 +5,9 @@ from mock import Mock, MagicMock, patch
from Bcfg2.Client.Tools.POSIX.Device import *
from .Test__init import get_posix_object
from .Testbase import TestPOSIXTool
-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
class TestPOSIXDevice(TestPOSIXTool):
test_obj = POSIXDevice
diff --git a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestDirectory.py b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestDirectory.py
index 34d47d8d3..0cf8cda93 100644
--- a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestDirectory.py
+++ b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestDirectory.py
@@ -6,7 +6,9 @@ from mock import Mock, MagicMock, patch
from Bcfg2.Client.Tools.POSIX.Directory import *
from .Test__init import get_posix_object
from .Testbase import TestPOSIXTool
-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
class TestPOSIXDirectory(TestPOSIXTool):
test_obj = POSIXDirectory
diff --git a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestFile.py b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestFile.py
index 66b5b44ad..c168c38e7 100644
--- a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestFile.py
+++ b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestFile.py
@@ -9,7 +9,9 @@ from mock import Mock, MagicMock, patch
from Bcfg2.Client.Tools.POSIX.File import *
from .Test__init import get_posix_object
from .Testbase import TestPOSIXTool
-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 get_file_object(posix=None):
if posix is None:
diff --git a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestHardlink.py b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestHardlink.py
index ae48bf04e..6221bd81c 100644
--- a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestHardlink.py
+++ b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestHardlink.py
@@ -5,7 +5,9 @@ from mock import Mock, MagicMock, patch
from Bcfg2.Client.Tools.POSIX.Hardlink import *
from .Test__init import get_posix_object
from .Testbase import TestPOSIXTool
-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
class TestPOSIXHardlink(TestPOSIXTool):
test_obj = POSIXHardlink
diff --git a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestNonexistent.py b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestNonexistent.py
index fbd9a11ad..592a108b9 100644
--- a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestNonexistent.py
+++ b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestNonexistent.py
@@ -5,7 +5,9 @@ from mock import Mock, MagicMock, patch
from Bcfg2.Client.Tools.POSIX.Nonexistent import *
from .Test__init import get_config, get_posix_object
from .Testbase import TestPOSIXTool
-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
class TestPOSIXNonexistent(TestPOSIXTool):
test_obj = POSIXNonexistent
diff --git a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestSymlink.py b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestSymlink.py
index 2cd10f243..d1d470b18 100644
--- a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestSymlink.py
+++ b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestSymlink.py
@@ -5,7 +5,9 @@ from mock import Mock, MagicMock, patch
from Bcfg2.Client.Tools.POSIX.Symlink import *
from .Test__init import get_posix_object
from .Testbase import TestPOSIXTool
-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
class TestPOSIXSymlink(TestPOSIXTool):
test_obj = POSIXSymlink
diff --git a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/Test__init.py b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/Test__init.py
index 20577a6da..f4e736678 100644
--- a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/Test__init.py
+++ b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/Test__init.py
@@ -3,7 +3,9 @@ import lxml.etree
from mock import Mock, MagicMock, patch
import Bcfg2.Client.Tools
import Bcfg2.Client.Tools.POSIX
-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 get_config(entries):
config = lxml.etree.Element("Configuration")
diff --git a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/Testbase.py b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/Testbase.py
index 65b92f75f..5d96a61d7 100644
--- a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/Testbase.py
+++ b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/Testbase.py
@@ -6,7 +6,9 @@ from mock import Mock, MagicMock, patch
import Bcfg2.Client.Tools
from Bcfg2.Client.Tools.POSIX.base import *
from .Test__init import get_posix_object
-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
try:
import selinux