Revert "from tests import"

This reverts commit d8599dcda06514a9687af3f714e55ff7580af9db.

Change-Id: Iddb881070a91b9761a567a7d3b6d906e228af9f6

19 files changed, 24 insertions, 24 deletions

diff --git a/tests/_ldap_livetest.py b/tests/_ldap_livetest.py
index 031bc2f5..f74bf16c 100644
--- a/tests/_ldap_livetest.py
+++ b/tests/_ldap_livetest.py
@@ -20,8 +20,8 @@ from keystone import config
 from keystone.identity.backends import ldap as identity_ldap
 from keystone import test
 
-from tests import default_fixtures
-from tests import test_backend_ldap
+import default_fixtures
+import test_backend_ldap
 
 
 CONF = config.CONF
diff --git a/tests/test_auth.py b/tests/test_auth.py
index f712e3be..1436d8ec 100644
--- a/tests/test_auth.py
+++ b/tests/test_auth.py
@@ -26,7 +26,7 @@ from keystone import test
 from keystone import token
 from keystone import trust
 
-from tests import default_fixtures
+import default_fixtures
 
 
 CONF = config.CONF
diff --git a/tests/test_backend_kvs.py b/tests/test_backend_kvs.py
index 50659a6c..f3a8ece0 100644
--- a/tests/test_backend_kvs.py
+++ b/tests/test_backend_kvs.py
@@ -24,8 +24,8 @@ from keystone import test
 from keystone.token.backends import kvs as token_kvs
 from keystone.trust.backends import kvs as trust_kvs
 
-from tests import default_fixtures
-from tests import test_backend
+import default_fixtures
+import test_backend
 
 
 class KvsIdentity(test.TestCase, test_backend.IdentityTests):
diff --git a/tests/test_backend_ldap.py b/tests/test_backend_ldap.py
index 36f6b184..1f8d2a2b 100644
--- a/tests/test_backend_ldap.py
+++ b/tests/test_backend_ldap.py
@@ -25,8 +25,8 @@ from keystone import exception
 from keystone import identity
 from keystone import test
 
-from tests import default_fixtures
-from tests import test_backend
+import default_fixtures
+import test_backend
 
 
 CONF = config.CONF
diff --git a/tests/test_backend_memcache.py b/tests/test_backend_memcache.py
index b333ce4d..b7f26b1d 100644
--- a/tests/test_backend_memcache.py
+++ b/tests/test_backend_memcache.py
@@ -23,7 +23,7 @@ from keystone.openstack.common import timeutils
 from keystone import test
 from keystone.token.backends import memcache as token_memcache
 
-from tests import test_backend
+import test_backend
 
 
 class MemcacheClient(object):
diff --git a/tests/test_backend_sql.py b/tests/test_backend_sql.py
index c9a4d236..1e7867bd 100644
--- a/tests/test_backend_sql.py
+++ b/tests/test_backend_sql.py
@@ -27,8 +27,8 @@ from keystone import token
 from keystone import trust
 
 
-from tests import default_fixtures
-from tests import test_backend
+import default_fixtures
+import test_backend
 
 CONF = config.CONF
 DEFAULT_DOMAIN_ID = CONF.identity.default_domain_id
diff --git a/tests/test_backend_templated.py b/tests/test_backend_templated.py
index df292e6e..31d77acd 100644
--- a/tests/test_backend_templated.py
+++ b/tests/test_backend_templated.py
@@ -21,8 +21,8 @@ from keystone.catalog.backends import templated as catalog_templated
 from keystone import exception
 from keystone import test
 
-from tests import default_fixtures
-from tests import test_backend
+import default_fixtures
+import test_backend
 
 DEFAULT_CATALOG_TEMPLATES = os.path.abspath(os.path.join(
     os.path.dirname(__file__),
diff --git a/tests/test_catalog.py b/tests/test_catalog.py
index aeb8ef49..690dde35 100644
--- a/tests/test_catalog.py
+++ b/tests/test_catalog.py
@@ -3,7 +3,7 @@ import uuid
 from keystone.common.sql import util as sql_util
 from keystone import test
 
-from tests import test_content_types
+import test_content_types
 
 
 BASE_URL = 'http://127.0.0.1:35357/v2'
diff --git a/tests/test_content_types.py b/tests/test_content_types.py
index 5f0ab6e0..a5457ccb 100644
--- a/tests/test_content_types.py
+++ b/tests/test_content_types.py
@@ -24,7 +24,7 @@ from keystone.common import serializer
 from keystone.openstack.common import jsonutils
 from keystone import test
 
-from tests import default_fixtures
+import default_fixtures
 
 
 class RestfulTestCase(test.TestCase):
diff --git a/tests/test_keystoneclient.py b/tests/test_keystoneclient.py
index 3b4de35c..dd7dc1d7 100644
--- a/tests/test_keystoneclient.py
+++ b/tests/test_keystoneclient.py
@@ -25,7 +25,7 @@ from keystone.openstack.common import timeutils
 from keystone import config
 from keystone import test
 
-from tests import default_fixtures
+import default_fixtures
 
 CONF = config.CONF
 DEFAULT_DOMAIN_ID = CONF.identity.default_domain_id
diff --git a/tests/test_keystoneclient_sql.py b/tests/test_keystoneclient_sql.py
index f5e69cce..69c667ed 100644
--- a/tests/test_keystoneclient_sql.py
+++ b/tests/test_keystoneclient_sql.py
@@ -22,7 +22,7 @@ from keystone.common import sql
 from keystone import config
 from keystone import test
 
-from tests import test_keystoneclient
+import test_keystoneclient
 
 
 CONF = config.CONF
diff --git a/tests/test_sql_upgrade.py b/tests/test_sql_upgrade.py
index 32bb3aad..62c69cc9 100644
--- a/tests/test_sql_upgrade.py
+++ b/tests/test_sql_upgrade.py
@@ -38,7 +38,7 @@ from keystone import config
 from keystone import exception
 from keystone import test
 
-from tests import default_fixtures
+import default_fixtures
 
 
 CONF = config.CONF
diff --git a/tests/test_v3.py b/tests/test_v3.py
index 197f9d2e..9b4f7d34 100644
--- a/tests/test_v3.py
+++ b/tests/test_v3.py
@@ -11,7 +11,7 @@ from keystone.openstack.common import timeutils
 from keystone.policy.backends import rules
 from keystone import test
 
-from tests import test_content_types
+import test_content_types
 
 
 CONF = config.CONF
diff --git a/tests/test_v3_auth.py b/tests/test_v3_auth.py
index e8c5e9be..4d6e0761 100644
--- a/tests/test_v3_auth.py
+++ b/tests/test_v3_auth.py
@@ -23,7 +23,7 @@ from keystone import config
 from keystone import exception
 from keystone import test
 
-from tests import test_v3
+import test_v3
 
 
 CONF = config.CONF
diff --git a/tests/test_v3_catalog.py b/tests/test_v3_catalog.py
index 74d84dd9..2d161db5 100644
--- a/tests/test_v3_catalog.py
+++ b/tests/test_v3_catalog.py
@@ -1,6 +1,6 @@
 import uuid
 
-from tests import test_v3
+import test_v3
 
 
 class CatalogTestCase(test_v3.RestfulTestCase):
diff --git a/tests/test_v3_identity.py b/tests/test_v3_identity.py
index 023e0759..9ef487c3 100644
--- a/tests/test_v3_identity.py
+++ b/tests/test_v3_identity.py
@@ -16,7 +16,7 @@
 
 import uuid
 
-from tests import test_v3
+import test_v3
 
 
 class IdentityTestCase(test_v3.RestfulTestCase):
diff --git a/tests/test_v3_policy.py b/tests/test_v3_policy.py
index 18afde09..1af68b6e 100644
--- a/tests/test_v3_policy.py
+++ b/tests/test_v3_policy.py
@@ -1,6 +1,6 @@
 import uuid
 
-from tests import test_v3
+import test_v3
 
 
 class PolicyTestCase(test_v3.RestfulTestCase):
diff --git a/tests/test_v3_protection.py b/tests/test_v3_protection.py
index 744cd3f0..5b461693 100644
--- a/tests/test_v3_protection.py
+++ b/tests/test_v3_protection.py
@@ -24,7 +24,7 @@ import nose.exc
 from keystone import config
 from keystone.policy.backends import rules
 
-from tests import test_v3
+import test_v3
 
 
 CONF = config.CONF
diff --git a/tests/test_v3_trust.py b/tests/test_v3_trust.py
index b23935e2..19d645d8 100644
--- a/tests/test_v3_trust.py
+++ b/tests/test_v3_trust.py
@@ -7,7 +7,7 @@ from keystone import config
 from keystone.common.sql import util as sql_util
 from keystone import test
 
-from tests import test_content_types
+import test_content_types
 
 
 CONF = config.CONF