Merge "Correct 401, 305, and www-authenticate responses"

2 files changed, 23 insertions, 13 deletions

diff --git a/keystone/backends/memcache/api/token.py b/keystone/backends/memcache/api/token.py
index a614eb33..c758a19b 100755
--- a/keystone/backends/memcache/api/token.py
+++ b/keystone/backends/memcache/api/token.py
@@ -14,39 +14,49 @@
 #    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #    License for the specific language governing permissions and limitations
 #    under the License.
-
+from keystone.backends.memcache import MEMCACHE_SERVER, models
 from keystone.backends.api import BaseTokenAPI
 
 
 class TokenAPI(BaseTokenAPI):
     def create(self, token):
+        if not hasattr(token, 'tenant_id'):
+            token.tenant_id = None
         if token.tenant_id != None:
             tenant_user_key = token.tenant_id + "::" + token.user_id
         else:
             tenant_user_key = token.user_id
-        #Setting them for  a day.
+
         MEMCACHE_SERVER.set(token.id, token)
         MEMCACHE_SERVER.set(tenant_user_key, token)
 
-    def get(self, id, session=None):
-        return  MEMCACHE_SERVER.get(id)
-
-    def delete(self, id, session=None):
+    def get(self, id):
         token = MEMCACHE_SERVER.get(id)
+        if token != None and not hasattr(token, 'tenant_id'):
+            token.tenant_id = None
+        return  token
+
+    def delete(self, id):
+        token = self.get(id)
         if token != None:
             MEMCACHE_SERVER.delete(id)
-
             if token.tenant_id != None:
                 MEMCACHE_SERVER.delete(token.tenant_id + "::" + token.user_id)
             else:
                 MEMCACHE_SERVER.delete(token.id)
                 MEMCACHE_SERVER.delete(token.user_id)
 
-    def get_for_user(self, user_id, session=None):
-        return MEMCACHE_SERVER.get(user_id)
-
-    def get_for_user_by_tenant(self, user_id, tenant_id, session=None):
-        return MEMCACHE_SERVER.get(tenant_id + "::" + user_id)
+    def get_for_user(self, user_id):
+        token = MEMCACHE_SERVER.get(user_id)
+        if token != None and not hasattr(token, 'tenant_id'):
+            token.tenant_id = None
+        return  token
+
+    def get_for_user_by_tenant(self, user_id, tenant_id):
+        token = MEMCACHE_SERVER.get(tenant_id + "::" + user_id)
+        if token != None and not hasattr(token, 'tenant_id'):
+            token.tenant_id = None
+        return  token
 
 
 def get():
diff --git a/run_tests.py b/run_tests.py
index 3816fcd5..6d10f9ee 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -12,7 +12,7 @@ TEST_DIR = os.path.join(os.path.abspath(os.path.dirname(__file__)),
 
 CONFIG_FILES = (
     'sql.conf.template',
-    #'memcache.conf.template',
+    # not passing 'memcache.conf.template',
     'ldap.conf.template')
 
 TEST_FILES = (