From fecf05988cac14676650bcaa22630ec321680cab Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 22 Aug 2012 15:31:11 -0400 Subject: fixed imports from test common --- testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py | 3 ++- testsuite/Testlib/TestServer/TestPlugins/TestProbes.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'testsuite/Testlib/TestServer/TestPlugins') diff --git a/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py b/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py index 29c17a320..c5569c2b6 100644 --- a/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py +++ b/testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py @@ -7,7 +7,8 @@ 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, \ - skip, skipIf, skipUnless, Bcfg2TestCase, DBModelTestCase, syncdb, patchIf + skip, skipIf, skipUnless, Bcfg2TestCase, DBModelTestCase, syncdb, \ + patchIf, datastore 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 cd489d5f0..3457444b2 100644 --- a/testsuite/Testlib/TestServer/TestPlugins/TestProbes.py +++ b/testsuite/Testlib/TestServer/TestPlugins/TestProbes.py @@ -5,7 +5,8 @@ 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, \ - skip, skipIf, skipUnless, Bcfg2TestCase, DBModelTestCase, syncdb, patchIf + skip, skipIf, skipUnless, Bcfg2TestCase, DBModelTestCase, syncdb, \ + patchIf, datastore import Bcfg2.Server import Bcfg2.Server.Plugin from Bcfg2.Server.Plugins.Probes import * -- cgit v1.2.3-1-g7c22