clean up test_identity_api

3 files changed, 9 insertions, 25 deletions

diff --git a/keystonelight/models.py b/keystonelight/models.py
index a3028d46..5cf76f6f 100644
--- a/keystonelight/models.py
+++ b/keystonelight/models.py
@@ -24,4 +24,4 @@ class Role(dict):
 
 class Extras(dict):
   def __init__(self, user=None, tenant=None, *args, **kw):
-    super(Extras, self).__init__(user=User, tenant=tenant, *args, **kw)
+    super(Extras, self).__init__(user=user, tenant=tenant, *args, **kw)
diff --git a/keystonelight/test.py b/keystonelight/test.py
index a0efb40d..282ad2d3 100644
--- a/keystonelight/test.py
+++ b/keystonelight/test.py
@@ -134,6 +134,8 @@ class TestCase(unittest.TestCase):
 
     for extras in fixtures.EXTRAS:
       extras_ref = extras.copy()
+      # TODO(termie): these will probably end up in the model anyway, so this
+      #               may be futile
       del extras_ref['user']
       del extras_ref['tenant']
       rv = self.identity_api.create_extras(
diff --git a/tests/test_identity_api.py b/tests/test_identity_api.py
index d5f6ce01..b0e55a95 100644
--- a/tests/test_identity_api.py
+++ b/tests/test_identity_api.py
@@ -7,35 +7,17 @@ from keystonelight import test
 from keystonelight import utils
 from keystonelight.backends import kvs
 
+import default_fixtures
+
 
 class IdentityApi(test.TestCase):
   def setUp(self):
     super(IdentityApi, self).setUp()
     self.options = self.appconfig('default')
-    app = self.loadapp('default')
-    self.app = app
-
-    self.identity_backend = utils.import_object(
-        self.options['identity_driver'], options=self.options)
-    self.token_backend = utils.import_object(
-        self.options['token_driver'], options=self.options)
-    self.catalog_backend = utils.import_object(
-        self.options['catalog_driver'], options=self.options)
-    self._load_fixtures()
-
-  def _load_fixtures(self):
-    self.tenant_bar = self.identity_backend.create_tenant(
-        'bar',
-        models.Tenant(id='bar', name='BAR'))
-    self.user_foo = self.identity_backend.create_user(
-        'foo',
-        models.User(id='foo',
-                    name='FOO',
-                    password='foo2',
-                    tenants=[self.tenant_bar['id']]))
-    self.extras_foobar = self.identity_backend.create_extras(
-        'foo', 'bar',
-        {'extra': 'extra'})
+    self.app = self.loadapp('default')
+
+    self.load_backends()
+    self.load_fixtures(default_fixtures)
 
   def _login(self):
     c = client.TestClient(self.app)