diff options
| author | Mark Haines <mark.haines@matrix.org> | 2015-12-01 19:15:27 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2015-12-01 19:15:27 +0000 |
| commit | f73ea0bda26a51794abedb65cbf4d0a717dee26c (patch) | |
| tree | 64fd41675594a7c71a7f119fb68b5b476f9173fd /tests | |
| parent | Only fire user_joined_room on the distributor if the user has actually joined... (diff) | |
| parent | Merge pull request #392 from matrix-org/markjh/client_config (diff) | |
| download | synapse-f73ea0bda26a51794abedb65cbf4d0a717dee26c.tar.xz | |
Merge branch 'develop' into markjh/edu_frequency
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/handlers/test_presence.py | 6 | ||||
| -rw-r--r-- | tests/utils.py | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/tests/handlers/test_presence.py b/tests/handlers/test_presence.py index 1172ceae8b..c42b5b80d7 100644 --- a/tests/handlers/test_presence.py +++ b/tests/handlers/test_presence.py @@ -365,7 +365,7 @@ class PresenceInvitesTestCase(PresenceTestCase): # TODO(paul): This test will likely break if/when real auth permissions # are added; for now the HS will always accept any invite - yield self.handler.send_invite( + yield self.handler.send_presence_invite( observer_user=self.u_apple, observed_user=self.u_banana) self.assertEquals( @@ -384,7 +384,7 @@ class PresenceInvitesTestCase(PresenceTestCase): @defer.inlineCallbacks def test_invite_local_nonexistant(self): - yield self.handler.send_invite( + yield self.handler.send_presence_invite( observer_user=self.u_apple, observed_user=self.u_durian) self.assertEquals( @@ -414,7 +414,7 @@ class PresenceInvitesTestCase(PresenceTestCase): defer.succeed((200, "OK")) ) - yield self.handler.send_invite( + yield self.handler.send_presence_invite( observer_user=self.u_apple, observed_user=u_rocket) self.assertEquals( diff --git a/tests/utils.py b/tests/utils.py index 91040c2efd..aee69b1caa 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -168,8 +168,9 @@ class MockHttpResource(HttpServer): raise KeyError("No event can handle %s" % path) - def register_path(self, method, path_pattern, callback): - self.callbacks.append((method, path_pattern, callback)) + def register_paths(self, method, path_patterns, callback): + for path_pattern in path_patterns: + self.callbacks.append((method, path_pattern, callback)) class MockKey(object): |