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_register.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_register.py')
| -rw-r--r-- | tests/handlers/test_register.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/handlers/test_register.py b/tests/handlers/test_register.py index 9c9d144690..a4380c48b4 100644 --- a/tests/handlers/test_register.py +++ b/tests/handlers/test_register.py @@ -53,13 +53,12 @@ class RegistrationTestCase(unittest.TestCase): @defer.inlineCallbacks def test_user_is_created_and_logged_in_if_doesnt_exist(self): - duration_ms = 200 local_part = "someone" display_name = "someone" user_id = "@someone:test" requester = create_requester("@as:test") result_user_id, result_token = yield self.handler.get_or_create_user( - requester, local_part, display_name, duration_ms) + requester, local_part, display_name) self.assertEquals(result_user_id, user_id) self.assertEquals(result_token, 'secret') @@ -71,12 +70,11 @@ class RegistrationTestCase(unittest.TestCase): user_id=frank.to_string(), token="jkv;g498752-43gj['eamb!-5", password_hash=None) - duration_ms = 200 local_part = "frank" display_name = "Frank" user_id = "@frank:test" requester = create_requester("@as:test") result_user_id, result_token = yield self.handler.get_or_create_user( - requester, local_part, display_name, duration_ms) + requester, local_part, display_name) self.assertEquals(result_user_id, user_id) self.assertEquals(result_token, 'secret') |