diff options
| author | Erik Johnston <erikj@jki.re> | 2017-10-11 13:20:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-11 13:20:07 +0100 |
| commit | 535cc49f27e28dd1148c6b92b6d1584cf3093e5c (patch) | |
| tree | f1714e604abf696ca1adec12fe7653dad8a3ef61 /tests/rest/client/v1 | |
| parent | Merge pull request #2501 from matrix-org/dbkr/channel_notifications (diff) | |
| parent | Validate room ids (diff) | |
| download | synapse-535cc49f27e28dd1148c6b92b6d1584cf3093e5c.tar.xz | |
Merge pull request #2466 from matrix-org/erikj/groups_merged
Initial Group Implementation
Diffstat (limited to 'tests/rest/client/v1')
| -rw-r--r-- | tests/rest/client/v1/test_profile.py | 3 | ||||
| -rw-r--r-- | tests/rest/client/v1/test_rooms.py | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/tests/rest/client/v1/test_profile.py b/tests/rest/client/v1/test_profile.py index 1e95e97538..dddcf51b69 100644 --- a/tests/rest/client/v1/test_profile.py +++ b/tests/rest/client/v1/test_profile.py @@ -46,6 +46,7 @@ class ProfileTestCase(unittest.TestCase): resource_for_client=self.mock_resource, federation=Mock(), replication_layer=Mock(), + profile_handler=self.mock_handler ) def _get_user_by_req(request=None, allow_guest=False): @@ -53,8 +54,6 @@ class ProfileTestCase(unittest.TestCase): hs.get_v1auth().get_user_by_req = _get_user_by_req - hs.get_handlers().profile_handler = self.mock_handler - profile.register_servlets(hs, self.mock_resource) @defer.inlineCallbacks diff --git a/tests/rest/client/v1/test_rooms.py b/tests/rest/client/v1/test_rooms.py index d746ea8568..de376fb514 100644 --- a/tests/rest/client/v1/test_rooms.py +++ b/tests/rest/client/v1/test_rooms.py @@ -1032,7 +1032,7 @@ class RoomMessageListTestCase(RestTestCase): @defer.inlineCallbacks def test_topo_token_is_accepted(self): - token = "t1-0_0_0_0_0_0_0_0" + token = "t1-0_0_0_0_0_0_0_0_0" (code, response) = yield self.mock_resource.trigger_get( "/rooms/%s/messages?access_token=x&from=%s" % (self.room_id, token)) @@ -1044,7 +1044,7 @@ class RoomMessageListTestCase(RestTestCase): @defer.inlineCallbacks def test_stream_token_is_accepted_for_fwd_pagianation(self): - token = "s0_0_0_0_0_0_0_0" + token = "s0_0_0_0_0_0_0_0_0" (code, response) = yield self.mock_resource.trigger_get( "/rooms/%s/messages?access_token=x&from=%s" % (self.room_id, token)) |