From 95dffe082adc72594587ed7dd36521f315655dbf Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Tue, 29 Jul 2014 01:21:40 +0900 Subject: [PATCH] Replace UserManager/TenantManager with None in tests 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 --- openstack_auth/tests/data_v2.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/openstack_auth/tests/data_v2.py b/openstack_auth/tests/data_v2.py index 5af21a6..e6cf4f3 100644 --- a/openstack_auth/tests/data_v2.py +++ b/openstack_auth/tests/data_v2.py @@ -53,8 +53,7 @@ def generate_test_data(): 'password': 'swordfish', 'token': '', 'enabled': True} - test_data.user = users.User(users.UserManager(None), - user_dict, loaded=True) + test_data.user = users.User(None, user_dict, loaded=True) # Tenants tenant_dict_1 = {'id': uuid.uuid4().hex, @@ -65,12 +64,8 @@ def generate_test_data(): 'name': 'tenant_two', 'description': '', 'enabled': False} - test_data.tenant_one = tenants.Tenant(tenants.TenantManager(None), - tenant_dict_1, - loaded=True) - test_data.tenant_two = tenants.Tenant(tenants.TenantManager(None), - tenant_dict_2, - loaded=True) + test_data.tenant_one = tenants.Tenant(None, tenant_dict_1, loaded=True) + test_data.tenant_two = tenants.Tenant(None, tenant_dict_2, loaded=True) nova_service = { 'type': 'compute',