summary refs log tree commit diff
path: root/tests/handlers/test_room.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2016-01-15 16:27:29 +0000
committerDaniel Wagner-Hall <dawagner@gmail.com>2016-01-15 16:27:29 +0000
commit5de1563997e62811f8c04033c0a86c12343c5e4a (patch)
treea280a81a343ec93900470c7f6ebf3280161ed7d2 /tests/handlers/test_room.py
parentMerge pull request #500 from matrix-org/daniel/cleanup (diff)
parentRequire unbanning before other membership changes (diff)
downloadsynapse-5de1563997e62811f8c04033c0a86c12343c5e4a.tar.xz
Merge pull request #501 from matrix-org/daniel/unban
Require unbanning before other membership changes
Diffstat (limited to 'tests/handlers/test_room.py')
-rw-r--r--tests/handlers/test_room.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/handlers/test_room.py b/tests/handlers/test_room.py
index 97491848a3..e7a12a2ba2 100644
--- a/tests/handlers/test_room.py
+++ b/tests/handlers/test_room.py
@@ -156,7 +156,7 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
             builder
         )
 
-        yield room_handler.change_membership(event, context)
+        yield room_handler.send_membership_event(event, context)
 
         self.state_handler.compute_event_context.assert_called_once_with(
             builder
@@ -232,7 +232,7 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
         )
 
         # Actual invocation
-        yield room_handler.change_membership(event, context)
+        yield room_handler.send_membership_event(event, context)
 
         self.federation.handle_new_event.assert_called_once_with(
             event, destinations=set()
@@ -312,7 +312,7 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
         self.distributor.observe("user_left_room", leave_signal_observer)
 
         # Actual invocation
-        yield room_handler.change_membership(event, context)
+        yield room_handler.send_membership_event(event, context)
 
         self.federation.handle_new_event.assert_called_once_with(
             event, destinations=set(['red'])