From 8002025375528bd2da28fd9c1d06e1971ff852ff Mon Sep 17 00:00:00 2001 From: Brant Knudson Date: Mon, 5 Dec 2016 17:24:31 -0600 Subject: [PATCH] Correct minor issues in test schema The JSONSchema used to validate the token response had a couple of issues: - The domain property schema was wrapped in a domain property - 'bind' in optional was always present already so no need to add it again. Change-Id: I512e5a041c6ba96fbff71fac1bfdde02f888a582 --- keystone/tests/unit/test_v3.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/keystone/tests/unit/test_v3.py b/keystone/tests/unit/test_v3.py index 0370b7c5f3..2f1e00c2d7 100644 --- a/keystone/tests/unit/test_v3.py +++ b/keystone/tests/unit/test_v3.py @@ -199,15 +199,13 @@ class RestfulTestCase(unit.SQLDriverOverrides, rest.RestfulTestCase, 'minItems': 1, } properties['domain'] = { - 'domain': { - 'type': 'object', - 'required': ['id', 'name'], - 'properties': { - 'id': {'type': 'string'}, - 'name': {'type': 'string'} - }, - 'additionalProperties': False - } + 'type': 'object', + 'required': ['id', 'name'], + 'properties': { + 'id': {'type': 'string'}, + 'name': {'type': 'string'} + }, + 'additionalProperties': False } elif project_scoped: properties['is_admin_project'] = {'type': 'boolean'} @@ -247,7 +245,6 @@ class RestfulTestCase(unit.SQLDriverOverrides, rest.RestfulTestCase, schema['optional'].append('catalog') elif project_scoped: schema['required'].append('project') - schema['optional'].append('bind') schema['optional'].append('catalog') schema['optional'].append('OS-TRUST:trust') schema['optional'].append('is_admin_project')