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. Change-Id: I261e79b31dfc7388adb3dc63a3a5e54042f05e54 Closes-Bug: #1347236
This commit is contained in:
parent
a1cf7e4626
commit
821619fff3
|
@ -53,9 +53,9 @@ def data(TEST):
|
|||
'project_id': '2',
|
||||
'enabled': True,
|
||||
'domain_id': "2"}
|
||||
TEST.ceilometer_users.add(users.User(users.UserManager(None),
|
||||
TEST.ceilometer_users.add(users.User(None,
|
||||
ceilometer_user_dict1))
|
||||
TEST.ceilometer_users.add(users.User(users.UserManager(None),
|
||||
TEST.ceilometer_users.add(users.User(None,
|
||||
ceilometer_user_dict2))
|
||||
|
||||
#tenants
|
||||
|
|
|
@ -177,7 +177,7 @@ def data(TEST):
|
|||
'project_id': '1',
|
||||
'enabled': True,
|
||||
'domain_id': "1"}
|
||||
user = users.User(users.UserManager(None), user_dict)
|
||||
user = users.User(None, user_dict)
|
||||
user_dict = {'id': "2",
|
||||
'name': 'user_two',
|
||||
'email': 'two@example.com',
|
||||
|
@ -186,7 +186,7 @@ def data(TEST):
|
|||
'project_id': '1',
|
||||
'enabled': True,
|
||||
'domain_id': "1"}
|
||||
user2 = users.User(users.UserManager(None), user_dict)
|
||||
user2 = users.User(None, user_dict)
|
||||
user_dict = {'id': "3",
|
||||
'name': 'user_three',
|
||||
'email': 'three@example.com',
|
||||
|
@ -195,7 +195,7 @@ def data(TEST):
|
|||
'project_id': '1',
|
||||
'enabled': True,
|
||||
'domain_id': "1"}
|
||||
user3 = users.User(users.UserManager(None), user_dict)
|
||||
user3 = users.User(None, user_dict)
|
||||
user_dict = {'id': "4",
|
||||
'name': 'user_four',
|
||||
'email': 'four@example.com',
|
||||
|
@ -204,7 +204,7 @@ def data(TEST):
|
|||
'project_id': '2',
|
||||
'enabled': True,
|
||||
'domain_id': "2"}
|
||||
user4 = users.User(users.UserManager(None), user_dict)
|
||||
user4 = users.User(None, user_dict)
|
||||
user_dict = {'id': "5",
|
||||
'name': 'user_five',
|
||||
'email': None,
|
||||
|
@ -213,7 +213,7 @@ def data(TEST):
|
|||
'project_id': '2',
|
||||
'enabled': True,
|
||||
'domain_id': "1"}
|
||||
user5 = users.User(users.UserManager(None), user_dict)
|
||||
user5 = users.User(None, user_dict)
|
||||
TEST.users.add(user, user2, user3, user4, user5)
|
||||
TEST.user = user # Your "current" user
|
||||
TEST.user.service_catalog = copy.deepcopy(SERVICE_CATALOG)
|
||||
|
|
Loading…
Reference in New Issue