Add token expiration

* Config option token.expiration defines amount of time tokens should be valid
* Fixes bug 928545

Change-Id: I3dff7a1ebf03bb44fc6e5247f976baea0581de08

1 files changed, 9 insertions, 5 deletions

diff --git a/tests/test_backend_memcache.py b/tests/test_backend_memcache.py
index b320b1f9..05ef2107 100644
--- a/tests/test_backend_memcache.py
+++ b/tests/test_backend_memcache.py
@@ -1,5 +1,7 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 
+import datetime
+import time
 import uuid
 
 import memcache
@@ -25,15 +27,17 @@ class MemcacheClient(object):
     def get(self, key):
         """Retrieves the value for a key or None."""
         self.check_key(key)
-        try:
-            return self.cache[key]
-        except KeyError:
+        obj = self.cache.get(key)
+        now = time.mktime(datetime.datetime.now().timetuple())
+        if obj and (obj[1] == 0 or obj[1] > now):
+            return obj[0]
+        else:
             raise exception.TokenNotFound(token_id=key)
 
-    def set(self, key, value):
+    def set(self, key, value, time=0):
         """Sets the value for a key."""
         self.check_key(key)
-        self.cache[key] = value
+        self.cache[key] = (value, time)
         return True
 
     def delete(self, key):