From 7d6d23d3780ef176eca9b353b5645762b13846c0 Mon Sep 17 00:00:00 2001 From: Richard Theis Date: Thu, 11 Feb 2016 07:30:56 -0600 Subject: [PATCH] Fix identity test_role functional tests A recent keystone change [1] resulted in the domain_id field being included when showing a role. [1] https://github.com/openstack/keystone/commit/407eabde417e85bb35bc7cbf1995857f4b20aeca Change-Id: I344f4d727f2a16217c075ad8b8393c1e0a233c2e Closes-Bug: #1544547 --- functional/tests/identity/v2/test_identity.py | 2 +- functional/tests/identity/v3/test_identity.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/functional/tests/identity/v2/test_identity.py b/functional/tests/identity/v2/test_identity.py index 1badf2fdcc..91a77b6785 100644 --- a/functional/tests/identity/v2/test_identity.py +++ b/functional/tests/identity/v2/test_identity.py @@ -24,7 +24,7 @@ class IdentityTests(test.TestCase): 'username', 'domain_id', 'default_project_id'] PROJECT_FIELDS = ['enabled', 'id', 'name', 'description', 'domain_id'] TOKEN_FIELDS = ['expires', 'id', 'project_id', 'user_id'] - ROLE_FIELDS = ['id', 'name', 'links'] + ROLE_FIELDS = ['id', 'name', 'links', 'domain_id'] SERVICE_FIELDS = ['id', 'enabled', 'name', 'type', 'description'] ENDPOINT_FIELDS = ['id', 'region', 'service_id', 'service_name', 'service_type', 'enabled', 'publicurl', diff --git a/functional/tests/identity/v3/test_identity.py b/functional/tests/identity/v3/test_identity.py index 3164e8fbb5..88f5196b41 100644 --- a/functional/tests/identity/v3/test_identity.py +++ b/functional/tests/identity/v3/test_identity.py @@ -30,7 +30,7 @@ class IdentityTests(test.TestCase): 'domain_id', 'default_project_id', 'description'] PROJECT_FIELDS = ['description', 'id', 'domain_id', 'is_domain', 'enabled', 'name', 'parent_id', 'links'] - ROLE_FIELDS = ['id', 'name', 'links'] + ROLE_FIELDS = ['id', 'name', 'links', 'domain_id'] SERVICE_FIELDS = ['id', 'enabled', 'name', 'type', 'description'] REGION_FIELDS = ['description', 'enabled', 'parent_region', 'region'] ENDPOINT_FIELDS = ['id', 'region', 'region_id', 'service_id',