diff options
| author | Morgan Fainberg <morgan.fainberg@gmail.com> | 2014-07-03 13:13:10 -0700 |
|---|---|---|
| committer | Morgan Fainberg <morgan.fainberg@gmail.com> | 2014-07-12 16:03:33 -0700 |
| commit | 883311d64fd749315ee3639bff6c730e86026ac5 (patch) | |
| tree | 7b5c2b03d13595dfd98aa023caa964d15567f48e /tempest/api/identity/admin/v3/test_trusts.py | |
| parent | 96646364daa4cc43011e7e29d6ab4c41e0b38fbf (diff) | |
| download | tempest-883311d64fd749315ee3639bff6c730e86026ac5.tar.gz | |
Re-enable 'check_trust_roles'
Re-enable the 'check_trust_roles' method. This can be
merged after the patches for change id
I13ce159cbe9739d4bf5d321fc4bd069245f32734 are merged
(master and stable/icehouse for Keystone).
This changeset updates the new location for the check_trust_role
HTTP status validation (in services/identity/v3/json/identity_client.py).
Previously this was located in identity/admin/v3/test_trusts.py.
Commented code indicating the above location change occurred has been
removed.
Change-Id: If1b7f18d7a357f4b3a4b478e300a17f2cc4a6159
Closes-Bug: #1334368
Diffstat (limited to 'tempest/api/identity/admin/v3/test_trusts.py')
| -rw-r--r-- | tempest/api/identity/admin/v3/test_trusts.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/tempest/api/identity/admin/v3/test_trusts.py b/tempest/api/identity/admin/v3/test_trusts.py index fed517181..1561a6e3c 100644 --- a/tempest/api/identity/admin/v3/test_trusts.py +++ b/tempest/api/identity/admin/v3/test_trusts.py @@ -150,7 +150,6 @@ class BaseTrustsV3Test(base.BaseIdentityV3AdminTest): self.assertNotIn('v3/roles/%s' % self.not_delegated_role_id, role['links']['self']) - @test.skip_because(bug='1334368') def check_trust_roles(self): # Check we find the delegated role _, roles_get = self.trustor_client.get_trust_roles( @@ -164,12 +163,6 @@ class BaseTrustsV3Test(base.BaseIdentityV3AdminTest): _, role_get = self.trustor_client.check_trust_role( self.trust_id, self.delegated_role_id) - # This tempest two-step change conflicted with the change - # moving response checking to the client. This test should be - # re-enabled by removing the following assert and changing - # the response code in tempest/services/identity/v3/json/ - # identity_client.py in the check_trust_role_method. - # self.assertEqual('200', resp['status']) # And that we don't find not_delegated_role self.assertRaises(exceptions.NotFound, |