summaryrefslogtreecommitdiffstats
path: root/tests/test_v3_catalog.py
diff options
context:
space:
mode:
authorDolph Mathews <dolph.mathews@gmail.com>2013-02-26 19:46:03 -0600
committerGerrit Code Review <review@openstack.org>2013-03-05 19:36:32 +0000
commitc0f017ce861d1532f790b18a137b491440ffa83b (patch)
tree84f4372d7184a4034c5d7ef783ead38a05ca4ff8 /tests/test_v3_catalog.py
parent601eeb50b60a2e99041690fe19238202bc203503 (diff)
downloadkeystone-c0f017ce861d1532f790b18a137b491440ffa83b.tar.gz
keystone-c0f017ce861d1532f790b18a137b491440ffa83b.tar.xz
keystone-c0f017ce861d1532f790b18a137b491440ffa83b.zip
Expand v3 trust test coverage
Change-Id: Ie697e19c2fa0e4ac203ff24aa9efa23c25ea6ccd
Diffstat (limited to 'tests/test_v3_catalog.py')
-rw-r--r--tests/test_v3_catalog.py46
1 files changed, 0 insertions, 46 deletions
diff --git a/tests/test_v3_catalog.py b/tests/test_v3_catalog.py
index 9f2f4f01..2d161db5 100644
--- a/tests/test_v3_catalog.py
+++ b/tests/test_v3_catalog.py
@@ -23,52 +23,6 @@ class CatalogTestCase(test_v3.RestfulTestCase):
self.endpoint_id,
self.endpoint.copy())
- # service validation
-
- def assertValidServiceListResponse(self, resp, **kwargs):
- return self.assertValidListResponse(
- resp,
- 'services',
- self.assertValidService,
- **kwargs)
-
- def assertValidServiceResponse(self, resp, ref):
- return self.assertValidResponse(
- resp,
- 'service',
- self.assertValidService,
- ref)
-
- def assertValidService(self, entity, ref=None):
- self.assertIsNotNone(entity.get('type'))
- if ref:
- self.assertEqual(ref['type'], entity['type'])
- return entity
-
- # endpoint validation
-
- def assertValidEndpointListResponse(self, resp, **kwargs):
- return self.assertValidListResponse(
- resp,
- 'endpoints',
- self.assertValidEndpoint,
- **kwargs)
-
- def assertValidEndpointResponse(self, resp, ref):
- return self.assertValidResponse(
- resp,
- 'endpoint',
- self.assertValidEndpoint,
- ref)
-
- def assertValidEndpoint(self, entity, ref=None):
- self.assertIsNotNone(entity.get('interface'))
- self.assertIsNotNone(entity.get('service_id'))
- if ref:
- self.assertEqual(ref['interface'], entity['interface'])
- self.assertEqual(ref['service_id'], entity['service_id'])
- return entity
-
# service crud tests
def test_create_service(self):