change session_for_tenant to use session_for_token correctly

rackerlabs · Feb 13, 2015 · 3ea035f · 3ea035f
1 parent 2182233
commit 3ea035f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/mimic/session.py b/mimic/session.py
@@ -177,4 +177,4 @@ def session_for_tenant_id(self, tenant_id):
         """
         if tenant_id not in self._tenant_to_token:
             return self._new_session(tenant_id=tenant_id)
-        return self.session_for_token(self._tenant_to_token[tenant_id])
+        return self.session_for_token(self._tenant_to_token[tenant_id])[0]
diff --git a/mimic/test/test_session.py b/mimic/test/test_session.py
@@ -73,7 +73,7 @@ def test_by_username_after_token(self):
         for the API key.
         """
         sessions = SessionStore(Clock())
-        a = sessions.session_for_token("testtoken")
+        (a, z) = sessions.session_for_token("testtoken")
         b = sessions.session_for_username_password(a.username, "testpswd")
         c = sessions.session_for_api_key(a.username, "testapikey")
         self.assertIdentical(a, b)
@@ -104,10 +104,10 @@ def test_by_token_after_username(self):
         sessions = SessionStore(Clock())
         a = sessions.session_for_username_password("username",
                                                    "testpswd")
-        b = sessions.session_for_token(a.token)
+        (b, z) = sessions.session_for_token(a.token)
         self.assertIdentical(a, b)
         c = sessions.session_for_api_key("apiuser", "testkey")
-        d = sessions.session_for_token(c.token)
+        (d, y) = sessions.session_for_token(c.token)
         self.assertIdentical(c, d)
 
     def test_by_token_after_username_wrong_tenant(self):
@@ -122,7 +122,7 @@ def test_by_token_after_username_wrong_tenant(self):
                                                    "testpswd")
         self.assertRaises(
             NonMatchingTenantError,
-            sessions.session_for_token,
+            sessions.session_for_token[0],
             a.token, a.tenant_id + 'wrong')
 
     def test_impersonation(self):
@@ -138,7 +138,7 @@ def test_impersonation(self):
         a = sessions.session_for_impersonation("pretender", A_LOT)
         a_prime = sessions.session_for_impersonation("pretender", A_LOT)
         self.assertIdentical(a, a_prime)
-        b = sessions.session_for_token(a.token)
+        (b, z) = sessions.session_for_token(a.token)
         self.assertEqual(
             a.expires, datetime.utcfromtimestamp(A_LITTLE + A_LOT))
         self.assertIdentical(a, b)
@@ -212,7 +212,7 @@ def test_sessions_created_all_have_integer_tenant_ids(self):
             sessions.session_for_username_password("someuser1", "testpass"),
             sessions.session_for_impersonation("someuser2", 12),
             sessions.session_for_api_key("someuser3", "someapikey"),
-            sessions.session_for_token("sometoken"),
+            sessions.session_for_token("sometoken")[0],
         ]
         integer = re.compile('^\d+$')
         for session in sessions:
@@ -237,7 +237,7 @@ def test_sessions_created_honor_specified_tenant_id(self):
                                                    "tenant1"),
             sessions.session_for_api_key("user2", "apikey",
                                          tenant_id="tenant2"),
-            sessions.session_for_token("token", tenant_id="tenant3"),
+            sessions.session_for_token("token", tenant_id="tenant3")[0],
             sessions.session_for_tenant_id("tenant4")
         ]
         for i, session in enumerate(sessions):