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

Replace UserManager/TenantManager with None in tests

Browse Source 
UserManager/TenantManager seems private classes in keystoneclient
and the interface was changed in keystoneclient 0.10.0.
django-openstack-auth tests actually don't need these managers,
so this commit makes test data not use these classes.

Change-Id: I9398c705acab262e89d4801da84ccea188980d99
Closes-Bug: #1349485
This commit is contained in:
Akihiro Motoki
2014-07-29 01:21:40 +09:00
parent 1f2bb06a15
commit 95dffe082a
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
openstack_auth/tests/data_v2.py
View File

@@ -53,8 +53,7 @@ def generate_test_data():
'password': 'swordfish', 'password': 'swordfish',
'token': '', 'token': '',
'enabled': True} 'enabled': True}
test_data.user = users.User(users.UserManager(None), test_data.user = users.User(None, user_dict, loaded=True)
user_dict, loaded=True)
# Tenants # Tenants
tenant_dict_1 = {'id': uuid.uuid4().hex, tenant_dict_1 = {'id': uuid.uuid4().hex,
@@ -65,12 +64,8 @@ def generate_test_data():
'name': 'tenant_two', 'name': 'tenant_two',
'description': '', 'description': '',
'enabled': False} 'enabled': False}
test_data.tenant_one = tenants.Tenant(tenants.TenantManager(None), test_data.tenant_one = tenants.Tenant(None, tenant_dict_1, loaded=True)
tenant_dict_1, test_data.tenant_two = tenants.Tenant(None, tenant_dict_2, loaded=True)
loaded=True)
test_data.tenant_two = tenants.Tenant(tenants.TenantManager(None),
tenant_dict_2,
loaded=True)
nova_service = { nova_service = {
'type': 'compute', 'type': 'compute',