diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-04-06 01:14:46 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-04-06 01:14:46 +0000 |
commit | b4990dcc31fcd1e53c97fff38088fc0d50dd7d3f (patch) | |
tree | 6f1a3aeb332b2b17940e4b04b2908eac375dea22 | |
parent | 0373e4c7c541c2b10ef04cbb6db876b6a21d0b1f (diff) | |
parent | 2074d3609d1f7e097ee18434d1004de2ec05198e (diff) | |
download | keystone-b4990dcc31fcd1e53c97fff38088fc0d50dd7d3f.tar.gz |
Merge "Move and refactor test_revoke_by_audit_chain_id"
-rw-r--r-- | keystone/tests/unit/test_revoke.py | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/keystone/tests/unit/test_revoke.py b/keystone/tests/unit/test_revoke.py index 4f7f51dc8..e034bc49e 100644 --- a/keystone/tests/unit/test_revoke.py +++ b/keystone/tests/unit/test_revoke.py @@ -438,6 +438,26 @@ class RevokeTests(object): token2['audit_chain_id'] = token2['audit_id'] self._assertTokenNotRevoked(token2) + def test_revoke_by_audit_chain_id(self): + revocation_backend = sql.Revoke() + + # Create our first token with audit_id + audit_id = common.build_audit_info(parent_audit_id=None)[0] + token = _sample_blank_token() + # Audit ID and Audit Chain ID are populated with the same value + # if the token is an original token + token['audit_id'] = audit_id + token['audit_chain_id'] = audit_id + # Check that the token is not revoked + self._assertTokenNotRevoked(token) + self.assertEqual(0, len(revocation_backend.list_events(token=token))) + + # Revoked token by audit chain id using the audit_id + self.revoke_api.revoke_by_audit_chain_id(audit_id) + # Check that the token is now revoked + self._assertTokenRevoked(token) + self.assertEqual(1, len(revocation_backend.list_events(token=token))) + @mock.patch.object(timeutils, 'utcnow') def test_expired_events_are_removed(self, mock_utcnow): def _sample_token_values(): @@ -607,26 +627,6 @@ class RevokeListTests(unit.TestCase): self.events.append(event) return event - def test_revoke_by_audit_chain_id(self): - audit_id = common.build_audit_info(parent_audit_id=None)[0] - token_data_1 = _sample_blank_token() - # Audit ID and Audit Chain ID are populated with the same value - # if the token is an original token - token_data_1['audit_id'] = audit_id - token_data_1['audit_chain_id'] = audit_id - event = self._revoke_by_audit_chain_id(audit_id) - self._assertTokenRevoked(token_data_1) - - audit_id_2 = common.build_audit_info(parent_audit_id=audit_id)[0] - token_data_2 = _sample_blank_token() - token_data_2['audit_id'] = audit_id_2 - token_data_2['audit_chain_id'] = audit_id - self._assertTokenRevoked(token_data_2) - - self.remove_event(event) - self._assertTokenNotRevoked(token_data_1) - self._assertTokenNotRevoked(token_data_2) - def remove_event(self, event): self.events.remove(event) remove_event(self.revoke_events, event) |