diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-05-13 16:59:56 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-05-13 16:59:56 +0100 |
| commit | 1f71f386f68423c00e0d4180ae48b271864b42a5 (patch) | |
| tree | 9dd45307ffd592023a8334e90d2c2180f4463225 /tests/api | |
| parent | Shift some of the state_group methods into the SlavedEventStore (diff) | |
| parent | Merge pull request #783 from matrix-org/markjh/slave_account_data (diff) | |
| download | synapse-1f71f386f68423c00e0d4180ae48b271864b42a5.tar.xz | |
Merge branch 'develop' into dbkr/email_notifs_on_pusher
Diffstat (limited to 'tests/api')
| -rw-r--r-- | tests/api/test_auth.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/api/test_auth.py b/tests/api/test_auth.py index 7e7b0b4b1d..ad269af0ec 100644 --- a/tests/api/test_auth.py +++ b/tests/api/test_auth.py @@ -284,12 +284,12 @@ class AuthTestCase(unittest.TestCase): macaroon.add_first_party_caveat("time < 1") # ms self.hs.clock.now = 5000 # seconds - - yield self.auth.get_user_from_macaroon(macaroon.serialize()) + self.hs.config.expire_access_token = True + # yield self.auth.get_user_from_macaroon(macaroon.serialize()) # TODO(daniel): Turn on the check that we validate expiration, when we # 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) + 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) |