summary refs log tree commit diff
path: root/tests/rest/test_profile.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/rest/test_profile.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/rest/test_profile.py')
-rw-r--r--tests/rest/test_profile.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/rest/test_profile.py b/tests/rest/test_profile.py
index 46e6137775..ff1e92805e 100644
--- a/tests/rest/test_profile.py
+++ b/tests/rest/test_profile.py
@@ -43,7 +43,7 @@ class ProfileTestCase(unittest.TestCase):
         hs = HomeServer("test",
             db_pool=None,
             http_client=None,
-            http_server=self.mock_server,
+            resource_for_client=self.mock_server,
             federation=Mock(),
             replication_layer=Mock(),
         )