summary refs log tree commit diff
path: root/tests/handlers/test_directory.py
diff options
context:
space:
mode:
authorEmmanuel ROHEE <erohee@amdocs.com>2014-08-14 11:36:50 +0200
committerEmmanuel ROHEE <erohee@amdocs.com>2014-08-14 11:36:50 +0200
commitd05ff3e0985d40f2a5fd6c095178f75aebf53220 (patch)
tree44c323d736e3e91d7cd38a9f6ea5f54c465f8990 /tests/handlers/test_directory.py
parentCreated m-file-input. A directive to open a file selection dialog on whatever... (diff)
parentHonour the -w flag to enable the web client at /matrix/client (diff)
downloadsynapse-d05ff3e0985d40f2a5fd6c095178f75aebf53220.tar.xz
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'tests/handlers/test_directory.py')
-rw-r--r--tests/handlers/test_directory.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/handlers/test_directory.py b/tests/handlers/test_directory.py
index 0ace2d0c9a..88ac8933f8 100644
--- a/tests/handlers/test_directory.py
+++ b/tests/handlers/test_directory.py
@@ -51,7 +51,7 @@ class DirectoryTestCase(unittest.TestCase):
                 "get_association_from_room_alias",
             ]),
             http_client=None,
-            http_server=Mock(),
+            resource_for_federation=Mock(),
             replication_layer=self.mock_federation,
         )
         hs.handlers = DirectoryHandlers(hs)