Removed http_server from HomeServer. Updated unit tests to use either resource_for_federation or resource_for_client depending on what is being tested.

This commit is contained in:
Kegan Dougal 2014-08-14 10:18:54 +01:00
parent 29aa13f0d4
commit 9a1638ed21
12 changed files with 21 additions and 30 deletions

View file

@ -52,7 +52,7 @@ class PresenceStateTestCase(unittest.TestCase):
db_pool=None,
http_client=None,
resource_for_client=self.mock_server,
http_server=self.mock_server,
resource_for_federation=self.mock_server,
)
def _get_user_by_token(token=None):
@ -110,7 +110,7 @@ class PresenceListTestCase(unittest.TestCase):
db_pool=None,
http_client=None,
resource_for_client=self.mock_server,
http_server=self.mock_server,
resource_for_federation=self.mock_server
)
def _get_user_by_token(token=None):
@ -185,8 +185,8 @@ class PresenceEventStreamTestCase(unittest.TestCase):
hs = HomeServer("test",
db_pool=None,
http_client=None,
http_server=self.mock_server,
resource_for_client=self.mock_server,
resource_for_federation=self.mock_server,
datastore=Mock(spec=[
"set_presence_state",
"get_presence_list",