From 4d3e89b06977362707ccb0d7f70311181b4e0da8 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Thu, 23 Aug 2012 07:38:54 -0400 Subject: removed relative imports from testsuite for py2.4 compat --- testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py | 13 +++++++++++-- testsuite/Testlib/TestServer/TestPlugins/TestProbes.py | 13 +++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) (limited to 'testsuite/Testlib/TestServer/TestPlugins') diff --git a/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py b/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py index c5569c2b6..4c0073dfd 100644 --- a/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py +++ b/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py @@ -5,8 +5,17 @@ import time import socket 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, \ + +# add all parent testsuite directories to sys.path to allow (most) +# relative imports in python 2.4 +path = os.path.dirname(__file__) +while path != "/": + if os.path.basename(path).lower().startswith("test"): + sys.path.append(path) + if os.path.basename(path) == "testsuite": + break + path = os.path.dirname(path) +from common import XI_NAMESPACE, XI, inPy3k, call, builtins, u, can_skip, \ skip, skipIf, skipUnless, Bcfg2TestCase, DBModelTestCase, syncdb, \ patchIf, datastore import Bcfg2.Server diff --git a/testsuite/Testlib/TestServer/TestPlugins/TestProbes.py b/testsuite/Testlib/TestServer/TestPlugins/TestProbes.py index 3457444b2..743ef508b 100644 --- a/testsuite/Testlib/TestServer/TestPlugins/TestProbes.py +++ b/testsuite/Testlib/TestServer/TestPlugins/TestProbes.py @@ -3,8 +3,17 @@ import sys import time 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, \ + +# add all parent testsuite directories to sys.path to allow (most) +# relative imports in python 2.4 +path = os.path.dirname(__file__) +while path != "/": + if os.path.basename(path).lower().startswith("test"): + sys.path.append(path) + if os.path.basename(path) == "testsuite": + break + path = os.path.dirname(path) +from common import XI_NAMESPACE, XI, inPy3k, call, builtins, u, can_skip, \ skip, skipIf, skipUnless, Bcfg2TestCase, DBModelTestCase, syncdb, \ patchIf, datastore import Bcfg2.Server -- cgit v1.2.3-1-g7c22