tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Turn TODO into thing which actually will fail

Browse source
This commit is contained in:
Daniel Wagner-Hall 2015-08-26 13:56:01 +01:00
parent 37f0ddca5f
commit 81450fded8
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tests/api/test_auth.py
View file

@ -14,7 +14,6 @@
# limitations under the License. # limitations under the License.
from tests import unittest from tests import unittest
from twisted.internet import defer from twisted.internet import defer
from twisted.trial.unittest import FailTest
from mock import Mock from mock import Mock
@ -251,7 +250,6 @@ class AuthTestCase(unittest.TestCase):
return_value={"name": "@baldrick:matrix.org"} return_value={"name": "@baldrick:matrix.org"}
) )
self.todo = (FailTest, "Token expiry isn't currently enabled",)
self.store.get_user_by_access_token = Mock( self.store.get_user_by_access_token = Mock(
return_value={"name": "@baldrick:matrix.org"} return_value={"name": "@baldrick:matrix.org"}
) )
@ -267,7 +265,12 @@ class AuthTestCase(unittest.TestCase):
macaroon.add_first_party_caveat("time < 1") # ms macaroon.add_first_party_caveat("time < 1") # ms
self.hs.clock.now = 5000 # seconds self.hs.clock.now = 5000 # seconds
with self.assertRaises(AuthError) as cm:
yield self.auth._get_user_from_macaroon(macaroon.serialize()) yield self.auth._get_user_from_macaroon(macaroon.serialize())
self.assertEqual(401, cm.exception.code) # TODO(daniel): Turn on the check that we validate expiration, when we
self.assertIn("Invalid macaroon", cm.exception.msg) # validate expiration (and remove the above line, which will start
# throwing).
# with self.assertRaises(AuthError) as cm:
# yield self.auth._get_user_from_macaroon(macaroon.serialize())
# self.assertEqual(401, cm.exception.code)
# self.assertIn("Invalid macaroon", cm.exception.msg)