fix tests

This commit is contained in:
David Baker 2016-01-06 16:46:41 +00:00
parent 992928304f
commit 0e48f7f245
3 changed files with 10 additions and 1 deletions

View File

@ -53,6 +53,8 @@ class FederationTestCase(unittest.TestCase):
"bulk_get_push_rules", "bulk_get_push_rules",
"get_current_state", "get_current_state",
"set_push_actions_for_event_and_users", "set_push_actions_for_event_and_users",
"is_guest",
"get_state_for_events",
]), ]),
resource_for_federation=NonCallableMock(), resource_for_federation=NonCallableMock(),
http_client=NonCallableMock(spec_set=[]), http_client=NonCallableMock(spec_set=[]),
@ -73,6 +75,8 @@ class FederationTestCase(unittest.TestCase):
self.handlers.federation_handler = FederationHandler(self.hs) self.handlers.federation_handler = FederationHandler(self.hs)
self.datastore.get_state_for_events.return_value = {"$a:b": {}}
@defer.inlineCallbacks @defer.inlineCallbacks
def test_msg(self): def test_msg(self):
pdu = FrozenEvent({ pdu = FrozenEvent({

View File

@ -47,6 +47,8 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
"bulk_get_push_rules", "bulk_get_push_rules",
"get_current_state", "get_current_state",
"set_push_actions_for_event_and_users", "set_push_actions_for_event_and_users",
"get_state_for_events",
"is_guest",
]), ]),
resource_for_federation=NonCallableMock(), resource_for_federation=NonCallableMock(),
http_client=NonCallableMock(spec_set=[]), http_client=NonCallableMock(spec_set=[]),
@ -116,6 +118,7 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
defer.succeed([]) defer.succeed([])
) )
self.datastore.get_current_state.return_value = {} self.datastore.get_current_state.return_value = {}
self.datastore.get_state_for_events = lambda event_ids,types: {x: {} for x in event_ids}
def annotate(_): def annotate(_):
ctx = Mock() ctx = Mock()
@ -198,6 +201,7 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
defer.succeed([]) defer.succeed([])
) )
self.datastore.get_current_state.return_value = {} self.datastore.get_current_state.return_value = {}
self.datastore.get_state_for_events = lambda event_ids,types: {x: {} for x in event_ids}
def annotate(_): def annotate(_):
ctx = Mock() ctx = Mock()
@ -274,6 +278,7 @@ class RoomMemberHandlerTestCase(unittest.TestCase):
defer.succeed([]) defer.succeed([])
) )
self.datastore.get_current_state.return_value = {} self.datastore.get_current_state.return_value = {}
self.datastore.get_state_for_events = lambda event_ids,types: {x: {} for x in event_ids}
def annotate(_): def annotate(_):
ctx = Mock() ctx = Mock()

View File

@ -45,7 +45,7 @@ class RegistrationStoreTestCase(unittest.TestCase):
self.assertEquals( self.assertEquals(
# TODO(paul): Surely this field should be 'user_id', not 'name' # TODO(paul): Surely this field should be 'user_id', not 'name'
# Additionally surely it shouldn't come in a 1-element list # Additionally surely it shouldn't come in a 1-element list
{"name": self.user_id, "password_hash": self.pwhash}, {"name": self.user_id, "password_hash": self.pwhash, "is_guest": 0},
(yield self.store.get_user_by_id(self.user_id)) (yield self.store.get_user_by_id(self.user_id))
) )