From 8425eabe6ffb9dcdfe205d559ca33e5cbf749428 Mon Sep 17 00:00:00 2001 From: termie Date: Tue, 27 Dec 2011 12:06:14 -0800 Subject: add basic fixture functionality --- tests/default_fixtures.py | 16 ++++++++++++++++ tests/test_backend_kvs.py | 17 ++--------------- 2 files changed, 18 insertions(+), 15 deletions(-) create mode 100644 tests/default_fixtures.py (limited to 'tests') diff --git a/tests/default_fixtures.py b/tests/default_fixtures.py new file mode 100644 index 00000000..15a8b60a --- /dev/null +++ b/tests/default_fixtures.py @@ -0,0 +1,16 @@ +TENANTS = [ + {'id': 'bar', 'name': 'BAR'}, + ] + +USERS = [ + {'id': 'foo', 'name': 'FOO', 'password': 'foo2', 'tenants': ['bar',]}, + ] + +EXTRAS = [ + {'user': 'foo', 'tenant': 'bar', 'extra': 'extra'}, + ] + +#ROLES = [ +# {'id': 'keystone_admin', 'name': 'Keystone Admin'}, +# ] +ROLES = [] diff --git a/tests/test_backend_kvs.py b/tests/test_backend_kvs.py index 166bc6c6..df88733d 100644 --- a/tests/test_backend_kvs.py +++ b/tests/test_backend_kvs.py @@ -4,27 +4,14 @@ from keystonelight import models from keystonelight import test from keystonelight.backends import kvs +import default_fixtures class KvsIdentity(test.TestCase): def setUp(self): super(KvsIdentity, self).setUp() options = self.appconfig('default') self.identity_api = kvs.KvsIdentity(options=options, db={}) - self._load_fixtures() - - def _load_fixtures(self): - self.tenant_bar = self.identity_api.create_tenant( - 'bar', - models.Tenant(id='bar', name='BAR')) - self.user_foo = self.identity_api.create_user( - 'foo', - models.User(id='foo', - name='FOO', - password='foo2', - tenants=[self.tenant_bar['id']])) - self.extras_foobar = self.identity_api.create_extras( - 'foo', 'bar', - {'extra': 'extra'}) + self.load_fixtures(default_fixtures) def test_authenticate_bad_user(self): self.assertRaises(AssertionError, -- cgit