diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2015-05-22 16:04:22 +0100 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2015-05-22 16:04:22 +0100 |
| commit | 5d53c143423ea58567f65231b8e98f92499b828c (patch) | |
| tree | 53761625ee318ccfd04ae6a9408aa2daee853197 /tests/appservice | |
| parent | Merge pull request #161 from matrix-org/erikj/txn_logging_fix (diff) | |
| parent | Remove unused import (diff) | |
| download | synapse-5d53c143423ea58567f65231b8e98f92499b828c.tar.xz | |
Merge pull request #160 from matrix-org/markjh/appservice_performance
Make the appservice use 'users_in_room' rather than get_room_members …
Diffstat (limited to 'tests/appservice')
| -rw-r--r-- | tests/appservice/test_appservice.py | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/tests/appservice/test_appservice.py b/tests/appservice/test_appservice.py index 62149d6902..8ce8dc0a87 100644 --- a/tests/appservice/test_appservice.py +++ b/tests/appservice/test_appservice.py @@ -217,18 +217,9 @@ class ApplicationServiceTestCase(unittest.TestCase): _regex("@irc_.*") ) join_list = [ - Mock( - type="m.room.member", room_id="!foo:bar", sender="@alice:here", - state_key="@alice:here" - ), - Mock( - type="m.room.member", room_id="!foo:bar", sender="@irc_fo:here", - state_key="@irc_fo:here" # AS user - ), - Mock( - type="m.room.member", room_id="!foo:bar", sender="@bob:here", - state_key="@bob:here" - ) + "@alice:here", + "@irc_fo:here", # AS user + "@bob:here", ] self.event.sender = "@xmpp_foobar:matrix.org" |