diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-08-27 17:28:55 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-08-27 17:28:55 +0100 |
| commit | 357dd1871d5d7d9761321ddc7092abac9bfe3574 (patch) | |
| tree | 26a11bd98ec0167d4bf81d6117ad45f50a5e7246 /tests/handlers/test_federation.py | |
| parent | Merge branch 'develop' into storage_transactions (diff) | |
| parent | Fix tests. (diff) | |
| download | synapse-357dd1871d5d7d9761321ddc7092abac9bfe3574.tar.xz | |
Merge branch 'develop' into storage_transactions
Conflicts: tests/handlers/test_federation.py tests/handlers/test_room.py
Diffstat (limited to 'tests/handlers/test_federation.py')
| -rw-r--r-- | tests/handlers/test_federation.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py index 5ad40e484c..bc260c8aab 100644 --- a/tests/handlers/test_federation.py +++ b/tests/handlers/test_federation.py @@ -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): |