openstack/deb-python-django-openstack-auth
Code Issues Proposed changes

Merge pull request #45 from saschpe/master-client025plus-fix

Browse Source 
Fix testsuite after "Support keystoneclient 0.2.5+"
This commit is contained in:
Gabriel Hurley
2013-07-01 11:44:37 -07:00
parent 036e34e194 a13abea67f
commit 74f800684a
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
openstack_auth/tests/data.py
View File

@@ -126,7 +126,7 @@ def generate_test_data():
loaded=True) loaded=True)
# Service Catalog # Service Catalog
test_data.service_catalog = ServiceCatalog({ test_data.service_catalog = ServiceCatalog.factory({
'serviceCatalog': [keystone_service, nova_service], 'serviceCatalog': [keystone_service, nova_service],
'token': { 'token': {
'id': scoped_token_dict['token']['id'], 'id': scoped_token_dict['token']['id'],
@@ -136,6 +136,9 @@ def generate_test_data():
} }
}) })
test_data.access_info = access.AccessInfo(scoped_token_dict) versioned_scoped_toked_dict = scoped_token_dict
versioned_scoped_toked_dict['version'] = 'v2.0'
test_data.access_info = access.AccessInfo(versioned_scoped_toked_dict)
return test_data return test_data

2
openstack_auth/tests/tests.py
View File

@@ -16,7 +16,7 @@ class OpenStackAuthTests(test.TestCase):
super(OpenStackAuthTests, self).setUp() super(OpenStackAuthTests, self).setUp()
self.mox = mox.Mox() self.mox = mox.Mox()
self.data = generate_test_data() self.data = generate_test_data()
endpoint = conf.settings.OPENSTACK_KEYSTONE_URL endpoint = settings.OPENSTACK_KEYSTONE_URL
self.keystone_client = client.Client(endpoint=endpoint, self.keystone_client = client.Client(endpoint=endpoint,
auth_ref=self.data.access_info) auth_ref=self.data.access_info)
if not hasattr(self.keystone_client, 'service_catalog'): if not hasattr(self.keystone_client, 'service_catalog'):