openstack/keystone
Code Issues Proposed changes

Removes use of freezegun in test_auth tests

Browse Source 
The tests are already using the oslo_utils TimeFixture to manage time. Using
freezegun seems to be redundant.

Change-Id: I1162214ebbeba9276c5c47e094df91a16bb74658
This commit is contained in:
David Stanek
2016-08-17 12:58:46 +00:00
parent 25d2f8e2ee
commit ecbeae5325
1 changed files with 19 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
keystone/tests/unit/test_auth.py
View File

@@ -18,7 +18,6 @@ import random
import string import string
import uuid import uuid
import freezegun
import mock import mock
import oslo_utils.fixture import oslo_utils.fixture
from oslo_utils import timeutils from oslo_utils import timeutils
@@ -1187,40 +1186,25 @@ class AuthWithTrust(object):
self.controller.authenticate, self.make_request(), request_body) self.controller.authenticate, self.make_request(), request_body)
def test_delete_trust_revokes_token(self): def test_delete_trust_revokes_token(self):
time = datetime.datetime.utcnow() unscoped_token = self.get_unscoped_token(self.trustor['name'])
with freezegun.freeze_time(time) as frozen_time: new_trust = self.create_trust(self.sample_data, self.trustor['name'])
# NOTE(lbragstad): The freezegun package will attempt to patch all request = self._create_auth_request(
# things in Python that issue a time. In some cases, by the time a unscoped_token['access']['token']['id'])
# test gets into the context manager of freezegun, the trust_token_resp = self.fetch_v2_token_from_trust(new_trust)
# oslo_utils.timeutils package could have an unpatched version of trust_scoped_token_id = trust_token_resp['access']['token']['id']
# whatever it gets it's time from. Here we are going to pull out self.controller.validate_token(
# our big hammer and use both freezegun and oslo_utils self.make_request(is_admin=True),
# set_time_override function to make sure that any datetimes token_id=trust_scoped_token_id)
# keystone asks for are under control of the context manager. If we trust_id = new_trust['id']
# don't do this, we could end up with situations where timeutils
# can give unpatched datetimes outside of the context we are self.time_fixture.advance_time_seconds(1)
# expecting, which leads to debugging frustrating race conditions.
timeutils.set_time_override(frozen_time.time_to_freeze) self.trust_controller.delete_trust(request, trust_id=trust_id)
unscoped_token = self.get_unscoped_token(self.trustor['name']) self.assertRaises(
new_trust = self.create_trust(self.sample_data, exception.TokenNotFound,
self.trustor['name']) self.controller.validate_token,
request = self._create_auth_request( self.make_request(is_admin=True),
unscoped_token['access']['token']['id']) token_id=trust_scoped_token_id)
trust_token_resp = self.fetch_v2_token_from_trust(new_trust)
trust_scoped_token_id = trust_token_resp['access']['token']['id']
self.controller.validate_token(
self.make_request(is_admin=True),
token_id=trust_scoped_token_id
)
trust_id = new_trust['id']
frozen_time.tick(delta=datetime.timedelta(seconds=1))
self.trust_controller.delete_trust(request, trust_id=trust_id)
self.assertRaises(
exception.TokenNotFound,
self.controller.validate_token,
self.make_request(is_admin=True),
token_id=trust_scoped_token_id
)
def test_token_from_trust_with_no_role_fails(self): def test_token_from_trust_with_no_role_fails(self):
new_trust = self.create_trust(self.sample_data, self.trustor['name']) new_trust = self.create_trust(self.sample_data, self.trustor['name'])