openstack/tempest
Code Issues Proposed changes

Merge "Fix test_admin_catalog_list"

Browse Source
This commit is contained in:
Jenkins 2013-08-29 10:47:37 +00:00 committed by Gerrit Code Review
commit 80c2079b0d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tempest/cli/simple_read_only/test_keystone.py
View File

@ -46,9 +46,12 @@ class SimpleReadOnlyKeystoneClientTest(tempest.cli.ClientTestBase):
out = self.keystone('catalog') out = self.keystone('catalog')
catalog = self.parser.details_multiple(out, with_label=True) catalog = self.parser.details_multiple(out, with_label=True)
for svc in catalog: for svc in catalog:
self.assertTrue(svc['__label'].startswith('Service:'), if svc.get('__label'):
msg=('Invalid beginning of service block: %s' % self.assertTrue(svc['__label'].startswith('Service:'),
svc['__label'])) msg=('Invalid beginning of service block: '
'%s' % svc['__label']))
self.assertIn('id', svc.keys())
self.assertIn('region', svc.keys())
def test_admin_endpoint_list(self): def test_admin_endpoint_list(self):
out = self.keystone('endpoint-list') out = self.keystone('endpoint-list')