summary refs log tree commit diff
path: root/tests/rest
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-08-14 09:52:20 +0100
committerKegan Dougal <kegan@matrix.org>2014-08-14 09:55:16 +0100
commit9f863d34663a4d58cf59cd15e0b0aa4a8e8581a5 (patch)
tree9a5058698cf4a43b1257596a82c622dca30cdbc1 /tests/rest
parentgrammar fix (diff)
downloadsynapse-9f863d34663a4d58cf59cd15e0b0aa4a8e8581a5.tar.xz
Start phasing out HttpServer: we should be using Resources instead. Added resource_for_client/federation/web_client to the HomeServer and hooked the C-S servlets to operate on resource_for_client. Dynamically construct the Resource tree.
Diffstat (limited to 'tests/rest')
-rw-r--r--tests/rest/test_presence.py3
-rw-r--r--tests/rest/test_profile.py1
2 files changed, 4 insertions, 0 deletions
diff --git a/tests/rest/test_presence.py b/tests/rest/test_presence.py
index f013abbee4..98b308dcdb 100644
--- a/tests/rest/test_presence.py
+++ b/tests/rest/test_presence.py
@@ -51,6 +51,7 @@ class PresenceStateTestCase(unittest.TestCase):
         hs = HomeServer("test",
             db_pool=None,
             http_client=None,
+            resource_for_client=self.mock_server,
             http_server=self.mock_server,
         )
 
@@ -108,6 +109,7 @@ class PresenceListTestCase(unittest.TestCase):
         hs = HomeServer("test",
             db_pool=None,
             http_client=None,
+            resource_for_client=self.mock_server,
             http_server=self.mock_server,
         )
 
@@ -184,6 +186,7 @@ class PresenceEventStreamTestCase(unittest.TestCase):
             db_pool=None,
             http_client=None,
             http_server=self.mock_server,
+            resource_for_client=self.mock_server,
             datastore=Mock(spec=[
                 "set_presence_state",
                 "get_presence_list",
diff --git a/tests/rest/test_profile.py b/tests/rest/test_profile.py
index 46e6137775..975d32f64d 100644
--- a/tests/rest/test_profile.py
+++ b/tests/rest/test_profile.py
@@ -44,6 +44,7 @@ class ProfileTestCase(unittest.TestCase):
             db_pool=None,
             http_client=None,
             http_server=self.mock_server,
+            resource_for_client=self.mock_server,
             federation=Mock(),
             replication_layer=Mock(),
         )