diff options
author | Jenkins <jenkins@review.openstack.org> | 2012-04-25 18:12:41 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2012-04-25 18:12:41 +0000 |
commit | f7baeb1099268657a216d53a05420567e3397909 (patch) | |
tree | 2e40aa6125dab9cd8b8944157ddc0ed52e8b3d7e /tests | |
parent | 63feb85652ea54f7ada434c0374f4f55d090dc53 (diff) | |
parent | 4cd2945740d37119be57f35e41afe3f2ab999114 (diff) | |
download | keystone-f7baeb1099268657a216d53a05420567e3397909.tar.gz keystone-f7baeb1099268657a216d53a05420567e3397909.tar.xz keystone-f7baeb1099268657a216d53a05420567e3397909.zip |
Merge "Fix expired token tests"
Diffstat (limited to 'tests')
-rw-r--r-- | tests/test_backend.py | 2 | ||||
-rw-r--r-- | tests/test_backend_memcache.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/test_backend.py b/tests/test_backend.py index 3bc743e0..d7079ba6 100644 --- a/tests/test_backend.py +++ b/tests/test_backend.py @@ -326,7 +326,7 @@ class TokenTests(object): def test_expired_token(self): token_id = uuid.uuid4().hex - expire_time = datetime.datetime.now() - datetime.timedelta(minutes=1) + expire_time = datetime.datetime.utcnow() - datetime.timedelta(minutes=1) data = {'id': token_id, 'a': 'b', 'expires': expire_time} data_ref = self.token_api.create_token(token_id, data) self.assertDictEqual(data_ref, data) diff --git a/tests/test_backend_memcache.py b/tests/test_backend_memcache.py index 60112a6f..2c07580b 100644 --- a/tests/test_backend_memcache.py +++ b/tests/test_backend_memcache.py @@ -42,7 +42,7 @@ class MemcacheClient(object): """Retrieves the value for a key or None.""" self.check_key(key) obj = self.cache.get(key) - now = time.mktime(datetime.datetime.utcnow().timetuple()) + now = time.mktime(datetime.datetime.utcnow().utctimetuple()) if obj and (obj[1] == 0 or obj[1] > now): return obj[0] else: |