diff options
| author | termie <github@anarkystic.com> | 2011-10-11 16:26:55 -0700 |
|---|---|---|
| committer | termie <github@anarkystic.com> | 2011-10-11 16:26:55 -0700 |
| commit | 50d64c3e07255563c44cdc50a4b5a27cbdeeedcf (patch) | |
| tree | 6ae68b9d7c8af31adc7b8cfbd349b736991b3f33 /tests | |
| parent | 35ec29740681f0e016f66a1be82aa5469db6c59b (diff) | |
| download | keystone-50d64c3e07255563c44cdc50a4b5a27cbdeeedcf.tar.gz keystone-50d64c3e07255563c44cdc50a4b5a27cbdeeedcf.tar.xz keystone-50d64c3e07255563c44cdc50a4b5a27cbdeeedcf.zip | |
getting closer, need to match api now
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/keystone_compat_HEAD.conf | 1 | ||||
| -rw-r--r-- | tests/test_keystone_compat.py | 14 |
2 files changed, 9 insertions, 6 deletions
diff --git a/tests/keystone_compat_HEAD.conf b/tests/keystone_compat_HEAD.conf index 5976c0b1..9154af1a 100644 --- a/tests/keystone_compat_HEAD.conf +++ b/tests/keystone_compat_HEAD.conf @@ -2,4 +2,5 @@ token_controller = keystonelight.keystone_compat.KeystoneTokenController identity_controller = keystonelight.keystone_compat.KeystoneIdentityController identity_driver = keystonelight.backends.kvs.KvsIdentity +token_driver = keystonelight.backends.kvs.KvsToken paste.app_factory = keystonelight.service:identity_app_factory diff --git a/tests/test_keystone_compat.py b/tests/test_keystone_compat.py index f3bb1d3f..95822d8f 100644 --- a/tests/test_keystone_compat.py +++ b/tests/test_keystone_compat.py @@ -42,27 +42,27 @@ class CompatTestCase(test.TestCase): os.path.join(self.sampledir, 'tenants.json'))) # For the tenants for token call - self.user_foo = self.backend._create_user( + self.user_foo = self.identity_backend._create_user( 'foo', models.User(id='foo', tenants=['1234', '3456'])) - self.tenant_1234 = self.backend._create_tenant( + self.tenant_1234 = self.identity_backend._create_tenant( '1234', models.Tenant(id='1234', name='ACME Corp', description='A description...', enabled=True)) - self.tenant_3456 = self.backend._create_tenant( + self.tenant_3456 = self.identity_backend._create_tenant( '3456', models.Tenant(id='3456', name='Iron Works', description='A description...', enabled=True)) - self.token_foo_unscoped = self.backend._create_token( + self.token_foo_unscoped = self.token_backend.create_token( 'foo_unscoped', models.Token(id='foo_unscoped', user='foo')) - self.token_foo_scoped = self.backend._create_token( + self.token_foo_scoped = self.token_backend.create_token( 'foo_scoped', models.Token(id='foo_unscoped', user='foo', @@ -75,8 +75,10 @@ class HeadCompatTestCase(CompatTestCase): self.sampledir = os.path.join(revdir, SAMPLE_DIR) self.app = self.loadapp('keystone_compat_HEAD') - self.backend = utils.import_object( + self.identity_backend = utils.import_object( self.app.options['identity_driver'], options=self.app.options) + self.token_backend = utils.import_object( + self.app.options['token_driver'], options=self.app.options) super(HeadCompatTestCase, self).setUp() |