diff options
author | Richard van der Hoff <richard@matrix.org> | 2016-11-30 17:10:04 +0000 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2016-11-30 17:10:04 +0000 |
commit | dc4b23e1a102071227288bb9d2ad77611f0d34c8 (patch) | |
tree | c1147b1f393c416daa7fd8855850e42caf9d9956 /tests/handlers/test_auth.py | |
parent | Stop generating refresh tokens (diff) | |
parent | Merge pull request #1660 from matrix-org/rav/better_content_type_validation (diff) | |
download | synapse-dc4b23e1a102071227288bb9d2ad77611f0d34c8.tar.xz |
Merge branch 'develop' into rav/no_more_refresh_tokens
Diffstat (limited to 'tests/handlers/test_auth.py')
-rw-r--r-- | tests/handlers/test_auth.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/handlers/test_auth.py b/tests/handlers/test_auth.py index 4a8cd19acf..9d013e5ca7 100644 --- a/tests/handlers/test_auth.py +++ b/tests/handlers/test_auth.py @@ -61,14 +61,14 @@ class AuthTestCase(unittest.TestCase): def verify_type(caveat): return caveat == "type = access" - def verify_expiry(caveat): - return caveat == "time < 8600000" + def verify_nonce(caveat): + return caveat.startswith("nonce =") v = pymacaroons.Verifier() v.satisfy_general(verify_gen) v.satisfy_general(verify_user) v.satisfy_general(verify_type) - v.satisfy_general(verify_expiry) + v.satisfy_general(verify_nonce) v.verify(macaroon, self.hs.config.macaroon_secret_key) def test_short_term_login_token_gives_user_id(self): |