Fix some of the tests to reflect changes in the storage layer.

This commit is contained in:
Erik Johnston 2014-08-15 17:42:21 +01:00
parent 40c020ad13
commit f5fca6f787
3 changed files with 11 additions and 39 deletions

View file

@ -40,7 +40,7 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
self.hostname,
db_pool=None,
datastore=NonCallableMock(spec_set=[
"store_room_member",
"persist_event",
"get_joined_hosts_for_room",
"get_room_member",
"get_room",
@ -97,7 +97,7 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
)
store_id = "store_id_fooo"
self.datastore.store_room_member.return_value = defer.succeed(store_id)
self.datastore.persist_event.return_value = defer.succeed(store_id)
# Actual invocation
yield self.room_member_handler.change_membership(event)
@ -110,12 +110,8 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
set(event.destinations)
)
self.datastore.store_room_member.assert_called_once_with(
user_id=target_user_id,
sender=user_id,
room_id=room_id,
content=content,
membership=Membership.INVITE,
self.datastore.persist_event.assert_called_once_with(
event
)
self.notifier.on_new_room_event.assert_called_once_with(
event, store_id)
@ -149,7 +145,7 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
)
store_id = "store_id_fooo"
self.datastore.store_room_member.return_value = defer.succeed(store_id)
self.datastore.persist_event.return_value = defer.succeed(store_id)
self.datastore.get_room.return_value = defer.succeed(1) # Not None.
prev_state = NonCallableMock()
@ -171,12 +167,8 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
set(event.destinations)
)
self.datastore.store_room_member.assert_called_once_with(
user_id=target_user_id,
sender=user_id,
room_id=room_id,
content=content,
membership=Membership.JOIN,
self.datastore.persist_event.assert_called_once_with(
event
)
self.notifier.on_new_room_event.assert_called_once_with(
event, store_id)