openstack
/
congress
Code Issues Proposed changes

Fix some tempest failures 

- keystone wont return columns which are not set
- flavor_client removed list_flavors_with_detail

Change-Id: I7b114592499876198bc81cc20a81722885520c9b
This commit is contained in:
Zhenzan Zhou 2015-07-03 10:55:09 +08:00
parent d8ef73b576
commit 77ae0cca96
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/tempest/tempest/scenario/congress_datasources/test_keystonev2.py
View File

@ -69,10 +69,12 @@ class TestKeystoneV2Driver(manager_congress.ScenarioPolicyBase):
except KeyError:
return False
for index in range(len(user_schema)):
if (user_schema[index]['name'] == 'tenantId' and
'tenantId' not in user_row):
# Keystone does not return the tenantId column if not
# present.
if ((user_schema[index]['name'] == 'tenantId' and
'tenantId' not in user_row) or
(user_schema[index]['name'] == 'email' and
'email' not in user_row)):
# Keystone does not return the tenantId or email column
# if not present.
pass
elif (str(row['data'][index]) !=
str(user_row[user_schema[index]['name']])):

2
contrib/tempest/tempest/scenario/congress_datasources/test_nova.py
View File

@ -95,7 +95,7 @@ class TestNovaDriver(manager_congress.ScenarioPolicyBase):
def _check_data_table_nova_flavors():
# Fetch data from nova each time, because this test may start
# before nova has all the users.
flavors = self.flavors_client.list_flavors_with_detail()
flavors = self.flavors_client.list_flavors(detail=True)
flavor_id_map = {}
for flavor in flavors:
flavor_id_map[flavor['id']] = flavor