summaryrefslogtreecommitdiffstats
path: root/testsuite
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-22 15:31:11 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-08-22 15:31:11 -0400
commitfecf05988cac14676650bcaa22630ec321680cab (patch)
treec11fb5c7d983929055688f8b7aeeea8027cc455e /testsuite
parent2b898c094a88f99e987f48a7d116d4a6009b456c (diff)
downloadbcfg2-fecf05988cac14676650bcaa22630ec321680cab.tar.gz
bcfg2-fecf05988cac14676650bcaa22630ec321680cab.tar.bz2
bcfg2-fecf05988cac14676650bcaa22630ec321680cab.zip
fixed imports from test common
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestDevice.py3
-rw-r--r--testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestDirectory.py3
-rw-r--r--testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestFile.py3
-rw-r--r--testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestHardlink.py3
-rw-r--r--testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestNonexistent.py3
-rw-r--r--testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestSymlink.py3
-rw-r--r--testsuite/Testlib/TestClient/TestTools/TestPOSIX/Test__init.py3
-rw-r--r--testsuite/Testlib/TestClient/TestTools/TestPOSIX/Testbase.py3
-rw-r--r--testsuite/Testlib/TestOptions.py3
-rw-r--r--testsuite/Testlib/TestServer/TestPlugin.py3
-rw-r--r--testsuite/Testlib/TestServer/TestPlugins/TestMetadata.py3
-rw-r--r--testsuite/Testlib/TestServer/TestPlugins/TestProbes.py3
12 files changed, 24 insertions, 12 deletions
diff --git a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestDevice.py b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestDevice.py
index 5b0d0eff0..1130199b4 100644
--- a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestDevice.py
+++ b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestDevice.py
@@ -7,7 +7,8 @@ from .Test__init import get_posix_object
from .Testbase import TestPOSIXTool
# 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
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 0cf8cda93..8c403ed85 100644
--- a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestDirectory.py
+++ b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestDirectory.py
@@ -8,7 +8,8 @@ from .Test__init import get_posix_object
from .Testbase import TestPOSIXTool
# 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
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 c168c38e7..b8b006100 100644
--- a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestFile.py
+++ b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestFile.py
@@ -11,7 +11,8 @@ from .Test__init import get_posix_object
from .Testbase import TestPOSIXTool
# 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
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 6221bd81c..af6834246 100644
--- a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestHardlink.py
+++ b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestHardlink.py
@@ -7,7 +7,8 @@ from .Test__init import get_posix_object
from .Testbase import TestPOSIXTool
# 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
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 592a108b9..b785e3b1f 100644
--- a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestNonexistent.py
+++ b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestNonexistent.py
@@ -7,7 +7,8 @@ from .Test__init import get_config, get_posix_object
from .Testbase import TestPOSIXTool
# 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
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 d1d470b18..9f8710e5d 100644
--- a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestSymlink.py
+++ b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestSymlink.py
@@ -7,7 +7,8 @@ from .Test__init import get_posix_object
from .Testbase import TestPOSIXTool
# 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
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 f4e736678..5242df509 100644
--- a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/Test__init.py
+++ b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/Test__init.py
@@ -5,7 +5,8 @@ import Bcfg2.Client.Tools
import Bcfg2.Client.Tools.POSIX
# 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
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 5d96a61d7..06585bb80 100644
--- a/testsuite/Testlib/TestClient/TestTools/TestPOSIX/Testbase.py
+++ b/testsuite/Testlib/TestClient/TestTools/TestPOSIX/Testbase.py
@@ -8,7 +8,8 @@ from Bcfg2.Client.Tools.POSIX.base import *
from .Test__init import get_posix_object
# 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
try:
import selinux
diff --git a/testsuite/Testlib/TestOptions.py b/testsuite/Testlib/TestOptions.py
index 102ef5166..b3bd51eed 100644
--- a/testsuite/Testlib/TestOptions.py
+++ b/testsuite/Testlib/TestOptions.py
@@ -4,7 +4,8 @@ from mock import Mock, MagicMock, patch
from Bcfg2.Options 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
+ skip, skipIf, skipUnless, Bcfg2TestCase, DBModelTestCase, syncdb, \
+ patchIf, datastore
# Compatibility imports
from Bcfg2.Bcfg2Py3k import ConfigParser
diff --git a/testsuite/Testlib/TestServer/TestPlugin.py b/testsuite/Testlib/TestServer/TestPlugin.py
index 64cde987e..c42b9f14d 100644
--- a/testsuite/Testlib/TestServer/TestPlugin.py
+++ b/testsuite/Testlib/TestServer/TestPlugin.py
@@ -10,7 +10,8 @@ from mock import Mock, MagicMock, patch
from Bcfg2.Server.Plugin 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
+ skip, skipIf, skipUnless, Bcfg2TestCase, DBModelTestCase, syncdb, \
+ patchIf, datastore
def tostring(el):
return lxml.etree.tostring(el, xml_declaration=False).decode('UTF-8')
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 *
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-06 06:12:34 +0000