diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-26 16:03:25 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-26 16:03:25 +0100 |
| commit | b1e98ddc093b04967dffa58a58c2bfee624870b8 (patch) | |
| tree | 1b850cf728afa2f97859429b110a043bc1fdf63e /tests/handlers | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor (diff) | |
| parent | Avoid double call of refresh at app startup (diff) | |
| download | synapse-b1e98ddc093b04967dffa58a58c2bfee624870b8.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
Diffstat (limited to 'tests/handlers')
| -rw-r--r-- | tests/handlers/test_federation.py | 1 | ||||
| -rw-r--r-- | tests/handlers/test_room.py | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py index f4cf54b7ee..a92d825f49 100644 --- a/tests/handlers/test_federation.py +++ b/tests/handlers/test_federation.py @@ -99,7 +99,6 @@ class FederationTestCase(unittest.TestCase): new_event = mem_handler.change_membership.call_args[0][0] self.assertEquals(RoomMemberEvent.TYPE, new_event.type) self.assertEquals(room_id, new_event.room_id) - self.assertEquals(user_id, new_event.target_user_id) self.assertEquals(user_id, new_event.state_key) self.assertEquals(Membership.JOIN, new_event.membership) diff --git a/tests/handlers/test_room.py b/tests/handlers/test_room.py index bf71d3be3b..fddab8f74f 100644 --- a/tests/handlers/test_room.py +++ b/tests/handlers/test_room.py @@ -85,7 +85,7 @@ class RoomMemberHandlerTestCase(unittest.TestCase): event = self.hs.get_event_factory().create_event( etype=RoomMemberEvent.TYPE, user_id=user_id, - target_user_id=target_user_id, + state_key=target_user_id, room_id=room_id, membership=Membership.INVITE, content=content, @@ -133,7 +133,7 @@ class RoomMemberHandlerTestCase(unittest.TestCase): event = self.hs.get_event_factory().create_event( etype=RoomMemberEvent.TYPE, user_id=user_id, - target_user_id=target_user_id, + state_key=target_user_id, room_id=room_id, membership=Membership.JOIN, content=content, @@ -359,7 +359,7 @@ class RoomCreationTest(unittest.TestCase): self.assertEquals(RoomMemberEvent.TYPE, join_event.type) self.assertEquals(room_id, join_event.room_id) self.assertEquals(user_id, join_event.user_id) - self.assertEquals(user_id, join_event.target_user_id) + self.assertEquals(user_id, join_event.state_key) self.assertTrue(self.state_handler.handle_new_event.called) |