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.

This commit is contained in:
Kegan Dougal 2014-08-14 09:52:20 +01:00
parent e7736668ba
commit 9f863d3466
7 changed files with 101 additions and 21 deletions

View file

@ -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",