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/TestClient/TestTools/TestPOSIX/TestDevice.py | 3 ++- testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestDirectory.py | 3 ++- testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestFile.py | 3 ++- testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestHardlink.py | 3 ++- testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestNonexistent.py | 3 ++- testsuite/Testlib/TestClient/TestTools/TestPOSIX/TestSymlink.py | 3 ++- testsuite/Testlib/TestClient/TestTools/TestPOSIX/Test__init.py | 3 ++- testsuite/Testlib/TestClient/TestTools/TestPOSIX/Testbase.py | 3 ++- 8 files changed, 16 insertions(+), 8 deletions(-) (limited to 'testsuite/Testlib/TestClient') 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 -- cgit v1.2.3-1-g7c22