commit 80c2079b0dd8f9d342dfeace736fe747baacaf41
author Jenkins <jenkins@review.openstack.org> Thu Aug 29 10:47:37 2013 +0000
committer Gerrit Code Review <review@openstack.org> Thu Aug 29 10:47:37 2013 +0000
tree 2347ca0e7a26062c999b306405ef27bba31e07e6
parent 1f469a566aef0e09d32a35a6b9996a8180721916
parent 49681808e702b91fd083d5511399b85ebb74d012

Merge "Fix test_admin_catalog_list"

tempest/cli/simple_read_only/test_keystone.py

diff --git a/tempest/cli/simple_read_only/test_keystone.py b/tempest/cli/simple_read_only/test_keystone.py
index 1e8009f..4c1c27f 100644
--- a/tempest/cli/simple_read_only/test_keystone.py
+++ b/tempest/cli/simple_read_only/test_keystone.py
@@ -46,9 +46,12 @@
         out = self.keystone('catalog')
         catalog = self.parser.details_multiple(out, with_label=True)
         for svc in catalog:
-            self.assertTrue(svc['__label'].startswith('Service:'),
-                            msg=('Invalid beginning of service block: %s' %
-                                 svc['__label']))
+            if svc.get('__label'):
+                self.assertTrue(svc['__label'].startswith('Service:'),
+                                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):
         out = self.keystone('endpoint-list')