Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-09-26 05:10:52 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into storage_transactions

Browse source 
Conflicts:
	tests/handlers/test_federation.py
	tests/handlers/test_room.py
This commit is contained in:
Mark Haines 2014-08-27 17:28:55 +01:00
commit 357dd1871d
5 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/handlers/test_federation.py
View file

@ -77,8 +77,7 @@ class FederationTestCase(unittest.TestCase):
yield self.handlers.federation_handler.on_receive_pdu(pdu, False)
self.datastore.persist_event.assert_called_once_with(ANY, False)
self.notifier.on_new_room_event.assert_called_once_with(
ANY, store_id)
self.notifier.on_new_room_event.assert_called_once_with(ANY)
@defer.inlineCallbacks
def test_invite_join_target_this(self):