openstack
/
horizon
Code Issues Proposed changes

Replace UserManager with None in tests 

Don't access keystoneclient's UserManager in tests. This should be
considered private data of keystoneclient and is not actually used by
horizon tests.

Conflicts:
	openstack_dashboard/test/test_data/keystone_data.py

Change-Id: I261e79b31dfc7388adb3dc63a3a5e54042f05e54
Closes-Bug: #1347236
(cherry picked from commit 821619fff3)
This commit is contained in:
Jamie Lennox 2014-07-23 08:55:55 +10:00 committed by Ihar Hrachyshka
parent 8a5f091cfa
commit df782fc2b5
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstack_dashboard/test/test_data/ceilometer_data.py
View File

@ -55,9 +55,9 @@ def data(TEST):
'project_id': '2', 'project_id': '2',
'enabled': True, 'enabled': True,
'domain_id': "2"} 'domain_id': "2"}
TEST.ceilometer_users.add(users.User(users.UserManager(None), TEST.ceilometer_users.add(users.User(None,
ceilometer_user_dict1)) ceilometer_user_dict1))
TEST.ceilometer_users.add(users.User(users.UserManager(None), TEST.ceilometer_users.add(users.User(None,
ceilometer_user_dict2)) ceilometer_user_dict2))
#tenants #tenants

8
openstack_dashboard/test/test_data/keystone_data.py
View File

@ -166,7 +166,7 @@ def data(TEST):
'project_id': '1', 'project_id': '1',
'enabled': True, 'enabled': True,
'domain_id': "1"} 'domain_id': "1"}
user = users.User(users.UserManager(None), user_dict) user = users.User(None, user_dict)
user_dict = {'id': "2", user_dict = {'id': "2",
'name': 'user_two', 'name': 'user_two',
'email': 'two@example.com', 'email': 'two@example.com',
@ -175,7 +175,7 @@ def data(TEST):
'project_id': '1', 'project_id': '1',
'enabled': True, 'enabled': True,
'domain_id': "1"} 'domain_id': "1"}
user2 = users.User(users.UserManager(None), user_dict) user2 = users.User(None, user_dict)
user_dict = {'id': "3", user_dict = {'id': "3",
'name': 'user_three', 'name': 'user_three',
'email': 'three@example.com', 'email': 'three@example.com',
@ -184,7 +184,7 @@ def data(TEST):
'project_id': '1', 'project_id': '1',
'enabled': True, 'enabled': True,
'domain_id': "1"} 'domain_id': "1"}
user3 = users.User(users.UserManager(None), user_dict) user3 = users.User(None, user_dict)
user_dict = {'id': "4", user_dict = {'id': "4",
'name': 'user_four', 'name': 'user_four',
'email': 'four@example.com', 'email': 'four@example.com',
@ -193,7 +193,7 @@ def data(TEST):
'project_id': '2', 'project_id': '2',
'enabled': True, 'enabled': True,
'domain_id': "2"} 'domain_id': "2"}
user4 = users.User(users.UserManager(None), user_dict) user4 = users.User(None, user_dict)
TEST.users.add(user, user2, user3, user4) TEST.users.add(user, user2, user3, user4)
TEST.user = user # Your "current" user TEST.user = user # Your "current" user
TEST.user.service_catalog = SERVICE_CATALOG TEST.user.service_catalog = SERVICE_CATALOG