diff options
author | Emmanuel ROHEE <erohee@amdocs.com> | 2014-08-14 11:36:50 +0200 |
---|---|---|
committer | Emmanuel ROHEE <erohee@amdocs.com> | 2014-08-14 11:36:50 +0200 |
commit | d05ff3e0985d40f2a5fd6c095178f75aebf53220 (patch) | |
tree | 44c323d736e3e91d7cd38a9f6ea5f54c465f8990 /tests/handlers/test_federation.py | |
parent | Created m-file-input. A directive to open a file selection dialog on whatever... (diff) | |
parent | Honour the -w flag to enable the web client at /matrix/client (diff) | |
download | synapse-d05ff3e0985d40f2a5fd6c095178f75aebf53220.tar.xz |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'tests/handlers/test_federation.py')
-rw-r--r-- | tests/handlers/test_federation.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/handlers/test_federation.py b/tests/handlers/test_federation.py index bdee7cfad4..ab9c242579 100644 --- a/tests/handlers/test_federation.py +++ b/tests/handlers/test_federation.py @@ -42,7 +42,7 @@ class FederationTestCase(unittest.TestCase): "persist_event", "store_room", ]), - http_server=NonCallableMock(), + resource_for_federation=NonCallableMock(), http_client=NonCallableMock(spec_set=[]), notifier=NonCallableMock(spec_set=["on_new_room_event"]), handlers=NonCallableMock(spec_set=[ |