summaryrefslogtreecommitdiffstats
path: root/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestFile.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-22 15:15:43 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-22 15:15:43 -0400
commit2b898c094a88f99e987f48a7d116d4a6009b456c (patch)
tree8ed5419373109592dc05398f41e1f8af79b71dd2 /testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestFile.py
parenta899adb987e3bdce30d7241ad0dc1ff77606f4b9 (diff)
downloadbcfg2-2b898c094a88f99e987f48a7d116d4a6009b456c.tar.gz
bcfg2-2b898c094a88f99e987f48a7d116d4a6009b456c.tar.bz2
bcfg2-2b898c094a88f99e987f48a7d116d4a6009b456c.zip
tweaked tests for python 2.5
Diffstat (limited to 'testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestFile.py')
-rw-r--r--testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestFile.py4
1 files changed, 3 insertions, 1 deletions
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: