openstack/python-keystoneclient
Code Issues Proposed changes

Removes use of timeutils.set_time_override

Browse Source 
The set_time_override function in timeutils was written as a
helper function to mock utcnow for unittests before 'mock' was
generally used. Now that we have mock and fixture, we no longer
need to use it.

Partial-Bug: #1266962

Change-Id: I56935911a08ccd9847419eb118af2d2c9dd6c1cd
This commit is contained in:
Zhongyue Luo
2014-01-10 01:56:15 +09:00
parent fdb5740ecf
commit 765e43bb51
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
keystoneclient/tests/test_auth_token_middleware.py
View File

@@ -715,16 +715,16 @@ class CommonAuthTokenMiddlewareTest(object):
token = self.token_dict['signed_token_scoped'] token = self.token_dict['signed_token_scoped']
req.headers['X-Auth-Token'] = token req.headers['X-Auth-Token'] = token
req.environ.update(extra_environ) req.environ.update(extra_environ)
try: timeutils_utcnow = 'keystoneclient.openstack.common.timeutils.utcnow'
now = datetime.datetime.utcnow() now = datetime.datetime.utcnow()
timeutils.set_time_override(now) with mock.patch(timeutils_utcnow) as mock_utcnow:
mock_utcnow.return_value = now
self.middleware(req.environ, self.start_fake_response) self.middleware(req.environ, self.start_fake_response)
self.assertNotEqual(self._get_cached_token(token), None) self.assertNotEqual(self._get_cached_token(token), None)
expired = now + datetime.timedelta(seconds=token_cache_time) expired = now + datetime.timedelta(seconds=token_cache_time)
timeutils.set_time_override(expired) with mock.patch(timeutils_utcnow) as mock_utcnow:
mock_utcnow.return_value = expired
self.assertEqual(self._get_cached_token(token), None) self.assertEqual(self._get_cached_token(token), None)
finally:
timeutils.clear_time_override()
def test_old_swift_memcache_set_expired(self): def test_old_swift_memcache_set_expired(self):
extra_conf = {'cache': 'swift.cache'} extra_conf = {'cache': 'swift.cache'}
@@ -1330,7 +1330,6 @@ class TokenEncodingTest(testtools.TestCase):
class TokenExpirationTest(BaseAuthTokenMiddlewareTest): class TokenExpirationTest(BaseAuthTokenMiddlewareTest):
def setUp(self): def setUp(self):
super(TokenExpirationTest, self).setUp() super(TokenExpirationTest, self).setUp()
timeutils.set_time_override()
self.now = timeutils.utcnow() self.now = timeutils.utcnow()
self.delta = datetime.timedelta(hours=1) self.delta = datetime.timedelta(hours=1)
self.one_hour_ago = timeutils.isotime(self.now - self.delta, self.one_hour_ago = timeutils.isotime(self.now - self.delta,
@@ -1340,7 +1339,6 @@ class TokenExpirationTest(BaseAuthTokenMiddlewareTest):
def tearDown(self): def tearDown(self):
super(TokenExpirationTest, self).tearDown() super(TokenExpirationTest, self).tearDown()
timeutils.clear_time_override()
def create_v2_token_fixture(self, expires=None): def create_v2_token_fixture(self, expires=None):
v2_fixture = { v2_fixture = {
@@ -1422,20 +1420,22 @@ class TokenExpirationTest(BaseAuthTokenMiddlewareTest):
auth_token.confirm_token_not_expired, auth_token.confirm_token_not_expired,
data) data)
def test_v2_token_with_timezone_offset_not_expired(self): @mock.patch('keystoneclient.openstack.common.timeutils.utcnow')
def test_v2_token_with_timezone_offset_not_expired(self, mock_utcnow):
current_time = timeutils.parse_isotime('2000-01-01T00:01:10.000123Z') current_time = timeutils.parse_isotime('2000-01-01T00:01:10.000123Z')
current_time = timeutils.normalize_time(current_time) current_time = timeutils.normalize_time(current_time)
timeutils.set_time_override(current_time) mock_utcnow.return_value = current_time
data = self.create_v2_token_fixture( data = self.create_v2_token_fixture(
expires='2000-01-01T00:05:10.000123-05:00') expires='2000-01-01T00:05:10.000123-05:00')
expected_expires = '2000-01-01T05:05:10.000123Z' expected_expires = '2000-01-01T05:05:10.000123Z'
actual_expires = auth_token.confirm_token_not_expired(data) actual_expires = auth_token.confirm_token_not_expired(data)
self.assertEqual(actual_expires, expected_expires) self.assertEqual(actual_expires, expected_expires)
def test_v2_token_with_timezone_offset_expired(self): @mock.patch('keystoneclient.openstack.common.timeutils.utcnow')
def test_v2_token_with_timezone_offset_expired(self, mock_utcnow):
current_time = timeutils.parse_isotime('2000-01-01T00:01:10.000123Z') current_time = timeutils.parse_isotime('2000-01-01T00:01:10.000123Z')
current_time = timeutils.normalize_time(current_time) current_time = timeutils.normalize_time(current_time)
timeutils.set_time_override(current_time) mock_utcnow.return_value = current_time
data = self.create_v2_token_fixture( data = self.create_v2_token_fixture(
expires='2000-01-01T00:05:10.000123+05:00') expires='2000-01-01T00:05:10.000123+05:00')
data['access']['token']['expires'] = '2000-01-01T00:05:10.000123+05:00' data['access']['token']['expires'] = '2000-01-01T00:05:10.000123+05:00'
@@ -1455,10 +1455,11 @@ class TokenExpirationTest(BaseAuthTokenMiddlewareTest):
auth_token.confirm_token_not_expired, auth_token.confirm_token_not_expired,
data) data)
def test_v3_token_with_timezone_offset_not_expired(self): @mock.patch('keystoneclient.openstack.common.timeutils.utcnow')
def test_v3_token_with_timezone_offset_not_expired(self, mock_utcnow):
current_time = timeutils.parse_isotime('2000-01-01T00:01:10.000123Z') current_time = timeutils.parse_isotime('2000-01-01T00:01:10.000123Z')
current_time = timeutils.normalize_time(current_time) current_time = timeutils.normalize_time(current_time)
timeutils.set_time_override(current_time) mock_utcnow.return_value = current_time
data = self.create_v3_token_fixture( data = self.create_v3_token_fixture(
expires='2000-01-01T00:05:10.000123-05:00') expires='2000-01-01T00:05:10.000123-05:00')
expected_expires = '2000-01-01T05:05:10.000123Z' expected_expires = '2000-01-01T05:05:10.000123Z'
@@ -1466,10 +1467,11 @@ class TokenExpirationTest(BaseAuthTokenMiddlewareTest):
actual_expires = auth_token.confirm_token_not_expired(data) actual_expires = auth_token.confirm_token_not_expired(data)
self.assertEqual(actual_expires, expected_expires) self.assertEqual(actual_expires, expected_expires)
def test_v3_token_with_timezone_offset_expired(self): @mock.patch('keystoneclient.openstack.common.timeutils.utcnow')
def test_v3_token_with_timezone_offset_expired(self, mock_utcnow):
current_time = timeutils.parse_isotime('2000-01-01T00:01:10.000123Z') current_time = timeutils.parse_isotime('2000-01-01T00:01:10.000123Z')
current_time = timeutils.normalize_time(current_time) current_time = timeutils.normalize_time(current_time)
timeutils.set_time_override(current_time) mock_utcnow.return_value = current_time
data = self.create_v3_token_fixture( data = self.create_v3_token_fixture(
expires='2000-01-01T00:05:10.000123+05:00') expires='2000-01-01T00:05:10.000123+05:00')
self.assertRaises(auth_token.InvalidUserToken, self.assertRaises(auth_token.InvalidUserToken,