diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-23 07:57:41 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-23 07:57:41 -0400 |
| commit | e9aa3cf5f15e06f3af837792a5fae967514cd0e5 (patch) | |
| tree | ec46cbcece8b8ae7c816be659d3fdf52d58689b7 /testsuite | |
| parent | 4d3e89b06977362707ccb0d7f70311181b4e0da8 (diff) | |
| download | bcfg2-e9aa3cf5f15e06f3af837792a5fae967514cd0e5.tar.gz bcfg2-e9aa3cf5f15e06f3af837792a5fae967514cd0e5.tar.bz2 bcfg2-e9aa3cf5f15e06f3af837792a5fae967514cd0e5.zip | |
removed two more relative imports
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py | 8 | ||||
| -rw-r--r-- | testsuite/Testlib/TestServer/TestPlugins/TestProbes.py | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py b/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py index 4c0073dfd..2ff0af78e 100644 --- a/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py +++ b/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py @@ -4,6 +4,9 @@ import copy import time import socket import lxml.etree +import Bcfg2.Server +import Bcfg2.Server.Plugin +from Bcfg2.Server.Plugins.Metadata import * from mock import Mock, patch # add all parent testsuite directories to sys.path to allow (most) @@ -18,10 +21,7 @@ while path != "/": from common import XI_NAMESPACE, XI, inPy3k, call, builtins, u, can_skip, \ skip, skipIf, skipUnless, Bcfg2TestCase, DBModelTestCase, syncdb, \ patchIf, datastore -import Bcfg2.Server -import Bcfg2.Server.Plugin -from Bcfg2.Server.Plugins.Metadata import * -from ..TestPlugin import TestXMLFileBacked, TestMetadata as _TestMetadata, \ +from TestPlugin import TestXMLFileBacked, TestMetadata as _TestMetadata, \ TestStatistics, TestDatabaseBacked def get_clients_test_tree(): diff --git a/testsuite/Testlib/TestServer/TestPlugins/TestProbes.py b/testsuite/Testlib/TestServer/TestPlugins/TestProbes.py index 743ef508b..e28cb7a29 100644 --- a/testsuite/Testlib/TestServer/TestPlugins/TestProbes.py +++ b/testsuite/Testlib/TestServer/TestPlugins/TestProbes.py @@ -2,6 +2,8 @@ import os import sys import time import lxml.etree +import Bcfg2.Server +import Bcfg2.Server.Plugin from mock import Mock, MagicMock, patch # add all parent testsuite directories to sys.path to allow (most) @@ -16,10 +18,8 @@ while path != "/": from common import XI_NAMESPACE, XI, inPy3k, call, builtins, u, can_skip, \ skip, skipIf, skipUnless, Bcfg2TestCase, DBModelTestCase, syncdb, \ patchIf, datastore -import Bcfg2.Server -import Bcfg2.Server.Plugin from Bcfg2.Server.Plugins.Probes import * -from ..TestPlugin import TestEntrySet, TestProbing, TestConnector, \ +from TestPlugin import TestEntrySet, TestProbing, TestConnector, \ TestDatabaseBacked # test data for JSON and YAML tests |