diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-22 16:10:42 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-22 16:10:42 +0100 |
| commit | 74b7de83ece889e585878c9974070e85a08d1a49 (patch) | |
| tree | 318942c37864d8e8683739ab83ac68f7b99c922c /tests/appservice | |
| parent | Actually return something from lambda (diff) | |
| parent | Merge pull request #156 from matrix-org/erikj/join_perf (diff) | |
| download | synapse-74b7de83ece889e585878c9974070e85a08d1a49.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/backfill_fixes
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" |