update tests

6 files changed, 14 insertions, 64 deletions

diff --git a/tests/backend_sql.conf b/tests/backend_sql.conf
index ca527e9a..30e8f6f5 100644
--- a/tests/backend_sql.conf
+++ b/tests/backend_sql.conf
@@ -6,4 +6,4 @@ max_pool_size = 10
 pool_timeout = 200
 
 [identity]
-driver = keystone.backends.sql.SqlIdentity
+driver = keystone.identity.backends.sql.Identity
diff --git a/tests/keystone_compat_diablo.conf b/tests/keystone_compat_diablo.conf
deleted file mode 100644
index 5db43f6f..00000000
--- a/tests/keystone_compat_diablo.conf
+++ /dev/null
@@ -1,52 +0,0 @@
-[DEFAULT]
-public_port = 5000
-admin_port = 35357
-admin_token = ADMIN
-
-[identity]
-driver = keystone.backends.kvs.KvsIdentity
-
-[catalog]
-driver = keystone.backends.kvs.KvsCatalog
-
-[token]
-driver = keystone.backends.kvs.KvsToken
-
-[policy]
-driver = keystone.backends.policy.SimpleMatch
-
-
-[filter:debug]
-paste.filter_factory = keystone.wsgi:Debug.factory
-
-[filter:token_auth]
-paste.filter_factory = keystone.middleware:TokenAuthMiddleware.factory
-
-[filter:admin_token_auth]
-paste.filter_factory = keystone.middleware:AdminTokenAuthMiddleware.factory
-
-[filter:json_body]
-paste.filter_factory = keystone.middleware:JsonBodyMiddleware.factory
-
-
-[app:keystone_service]
-paste.app_factory = keystone.service:service_app_factory
-
-[app:keystone_admin]
-paste.app_factory = keystone.service:admin_app_factory
-
-
-[pipeline:keystone_service_api]
-pipeline = token_auth admin_token_auth json_body debug keystone_service
-
-[pipeline:keystone_admin_api]
-pipeline = token_auth admin_token_auth json_body debug keystone_admin
-
-
-[composite:main]
-use = egg:Paste#urlmap
-/v2.0 = keystone_service_api
-
-[composite:admin]
-use = egg:Paste#urlmap
-/v2.0 = keystone_admin_api
diff --git a/tests/test_backend_kvs.py b/tests/test_backend_kvs.py
index 85b9fef6..fe68dd78 100644
--- a/tests/test_backend_kvs.py
+++ b/tests/test_backend_kvs.py
@@ -1,7 +1,9 @@
 import uuid
 
 from keystone import test
-from keystone.backends import kvs
+from keystone.identity.backends import kvs as identity_kvs
+from keystone.token.backends import kvs as token_kvs
+from keystone.catalog.backends import kvs as catalog_kvs
 
 import test_backend
 import default_fixtures
@@ -10,14 +12,14 @@ import default_fixtures
 class KvsIdentity(test.TestCase, test_backend.IdentityTests):
   def setUp(self):
     super(KvsIdentity, self).setUp()
-    self.identity_api = kvs.KvsIdentity(db={})
+    self.identity_api = identity_kvs.Identity(db={})
     self.load_fixtures(default_fixtures)
 
 
 class KvsToken(test.TestCase):
   def setUp(self):
     super(KvsToken, self).setUp()
-    self.token_api = kvs.KvsToken(db={})
+    self.token_api = token_kvs.Token(db={})
 
   def test_token_crud(self):
     token_id = uuid.uuid4().hex
@@ -37,7 +39,7 @@ class KvsToken(test.TestCase):
 class KvsCatalog(test.TestCase):
   def setUp(self):
     super(KvsCatalog, self).setUp()
-    self.catalog_api = kvs.KvsCatalog(db={})
+    self.catalog_api = catalog_kvs.Catalog(db={})
     self._load_fixtures()
 
   def _load_fixtures(self):
diff --git a/tests/test_backend_sql.py b/tests/test_backend_sql.py
index faaa3b21..fe137f52 100644
--- a/tests/test_backend_sql.py
+++ b/tests/test_backend_sql.py
@@ -3,8 +3,8 @@ import uuid
 
 from keystone import config
 from keystone import test
-from keystone.backends import sql
-from keystone.backends.sql import util as sql_util
+from keystone.common.sql import util as sql_util
+from keystone.identity.backends import sql as identity_sql
 
 import test_backend
 import default_fixtures
@@ -25,7 +25,7 @@ class SqlIdentity(test.TestCase, test_backend.IdentityTests):
                        test.testsdir('test_overrides.conf'),
                        test.testsdir('backend_sql.conf')])
     sql_util.setup_test_database()
-    self.identity_api = sql.SqlIdentity()
+    self.identity_api = identity_sql.Identity()
     self.load_fixtures(default_fixtures)
 
 
diff --git a/tests/test_legacy_compat.py b/tests/test_legacy_compat.py
index fca00b68..ff6b7fdb 100644
--- a/tests/test_legacy_compat.py
+++ b/tests/test_legacy_compat.py
@@ -6,9 +6,9 @@ import sys
 from nose import exc
 
 from keystone import config
-from keystone import logging
 from keystone import test
-from keystone import utils
+from keystone.common import logging
+from keystone.common import utils
 
 
 CONF = config.CONF
diff --git a/tests/test_novaclient_compat.py b/tests/test_novaclient_compat.py
index 203fa939..b4f6dc79 100644
--- a/tests/test_novaclient_compat.py
+++ b/tests/test_novaclient_compat.py
@@ -4,9 +4,9 @@ import os
 import sys
 
 from keystone import config
-from keystone import logging
 from keystone import test
-from keystone import utils
+from keystone.common import logging
+from keystone.common import utils
 
 import default_fixtures