openstack/python-keystoneclient
Code Issues Proposed changes

Merge "Fix STALE_TOKEN_DURATION usage"

Browse Source
This commit is contained in:
Jenkins
2013-01-26 17:32:13 +00:00
committed by Gerrit Code Review
parent 9392732a3f 7afcea1e66
commit 1cbda90717
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
keystoneclient/access.py
View File

@@ -21,7 +21,7 @@ from keystoneclient.openstack.common import timeutils
# gap, in seconds, to determine whether the given token is about to expire # gap, in seconds, to determine whether the given token is about to expire
STALE_TOKEN_DURATION = '30' STALE_TOKEN_DURATION = 30
class AccessInfo(dict): class AccessInfo(dict):
@@ -34,7 +34,8 @@ class AccessInfo(dict):
:return: boolean : true if expiration is within the given duration :return: boolean : true if expiration is within the given duration
""" """
stale_duration = stale_duration or TALE_TOKEN_DURATION stale_duration = (STALE_TOKEN_DURATION if stale_duration is None
else stale_duration)
norm_expires = timeutils.normalize_time(self.expires) norm_expires = timeutils.normalize_time(self.expires)
# (gyee) should we move auth_token.will_expire_soon() to timeutils # (gyee) should we move auth_token.will_expire_soon() to timeutils
# instead of duplicating code here? # instead of duplicating code here?

1
tests/test_access.py
View File

@@ -40,6 +40,7 @@ class AccessInfoTest(utils.TestCase):
auth_ref = access.AccessInfo(UNSCOPED_TOKEN['access']) auth_ref = access.AccessInfo(UNSCOPED_TOKEN['access'])
self.assertFalse(auth_ref.will_expire_soon(stale_duration=120)) self.assertFalse(auth_ref.will_expire_soon(stale_duration=120))
self.assertTrue(auth_ref.will_expire_soon(stale_duration=300)) self.assertTrue(auth_ref.will_expire_soon(stale_duration=300))
self.assertFalse(auth_ref.will_expire_soon())
def test_building_scoped_accessinfo(self): def test_building_scoped_accessinfo(self):
auth_ref = access.AccessInfo(PROJECT_SCOPED_TOKEN['access']) auth_ref = access.AccessInfo(PROJECT_SCOPED_TOKEN['access'])