Merge "from tests import"

19 files changed, 24 insertions, 24 deletions

diff --git a/tests/_ldap_livetest.py b/tests/_ldap_livetest.py
index f74bf16c..031bc2f5 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
 
-import default_fixtures
-import test_backend_ldap
+from tests import default_fixtures
+from tests import test_backend_ldap
 
 
 CONF = config.CONF
diff --git a/tests/test_auth.py b/tests/test_auth.py
index 1436d8ec..f712e3be 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
 
-import default_fixtures
+from tests import default_fixtures
 
 
 CONF = config.CONF
diff --git a/tests/test_backend_kvs.py b/tests/test_backend_kvs.py
index f3a8ece0..50659a6c 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
 
-import default_fixtures
-import test_backend
+from tests import default_fixtures
+from tests 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 965e2eed..bd94f004 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
 
-import default_fixtures
-import test_backend
+from tests import default_fixtures
+from tests import test_backend
 
 
 CONF = config.CONF
diff --git a/tests/test_backend_memcache.py b/tests/test_backend_memcache.py
index b7f26b1d..b333ce4d 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
 
-import test_backend
+from tests import test_backend
 
 
 class MemcacheClient(object):
diff --git a/tests/test_backend_sql.py b/tests/test_backend_sql.py
index 1e7867bd..c9a4d236 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
 
 
-import default_fixtures
-import test_backend
+from tests import default_fixtures
+from tests 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 31d77acd..df292e6e 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
 
-import default_fixtures
-import test_backend
+from tests import default_fixtures
+from tests 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 690dde35..aeb8ef49 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
 
-import test_content_types
+from tests 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 a5457ccb..5f0ab6e0 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
 
-import default_fixtures
+from tests import default_fixtures
 
 
 class RestfulTestCase(test.TestCase):
diff --git a/tests/test_keystoneclient.py b/tests/test_keystoneclient.py
index dd7dc1d7..3b4de35c 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
 
-import default_fixtures
+from tests 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 69c667ed..f5e69cce 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
 
-import test_keystoneclient
+from tests import test_keystoneclient
 
 
 CONF = config.CONF
diff --git a/tests/test_sql_upgrade.py b/tests/test_sql_upgrade.py
index 003fb4ec..dc7cce5e 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
 
-import default_fixtures
+from tests import default_fixtures
 
 
 CONF = config.CONF
diff --git a/tests/test_v3.py b/tests/test_v3.py
index 9b4f7d34..197f9d2e 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
 
-import test_content_types
+from tests import test_content_types
 
 
 CONF = config.CONF
diff --git a/tests/test_v3_auth.py b/tests/test_v3_auth.py
index 40a4c846..f2909753 100644
--- a/tests/test_v3_auth.py
+++ b/tests/test_v3_auth.py
@@ -21,7 +21,7 @@ from keystone import config
 from keystone import exception
 from keystone import test
 
-import test_v3
+from tests import test_v3
 
 
 CONF = config.CONF
diff --git a/tests/test_v3_catalog.py b/tests/test_v3_catalog.py
index 2d161db5..74d84dd9 100644
--- a/tests/test_v3_catalog.py
+++ b/tests/test_v3_catalog.py
@@ -1,6 +1,6 @@
 import uuid
 
-import test_v3
+from tests import test_v3
 
 
 class CatalogTestCase(test_v3.RestfulTestCase):
diff --git a/tests/test_v3_identity.py b/tests/test_v3_identity.py
index 9ef487c3..023e0759 100644
--- a/tests/test_v3_identity.py
+++ b/tests/test_v3_identity.py
@@ -16,7 +16,7 @@
 
 import uuid
 
-import test_v3
+from tests import test_v3
 
 
 class IdentityTestCase(test_v3.RestfulTestCase):
diff --git a/tests/test_v3_policy.py b/tests/test_v3_policy.py
index 1af68b6e..18afde09 100644
--- a/tests/test_v3_policy.py
+++ b/tests/test_v3_policy.py
@@ -1,6 +1,6 @@
 import uuid
 
-import test_v3
+from tests import test_v3
 
 
 class PolicyTestCase(test_v3.RestfulTestCase):
diff --git a/tests/test_v3_protection.py b/tests/test_v3_protection.py
index 5b461693..744cd3f0 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
 
-import test_v3
+from tests import test_v3
 
 
 CONF = config.CONF
diff --git a/tests/test_v3_trust.py b/tests/test_v3_trust.py
index 19d645d8..b23935e2 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
 
-import test_content_types
+from tests import test_content_types
 
 
 CONF = config.CONF