diff options
| author | Kegan Dougal <kegan@matrix.org> | 2014-08-14 10:18:54 +0100 |
|---|---|---|
| committer | Kegan Dougal <kegan@matrix.org> | 2014-08-14 10:18:54 +0100 |
| commit | 9a1638ed21ea716b999853c8d63c30073e677c46 (patch) | |
| tree | 60c79cacb7e6b0df578141fc6b4c1a111f983686 /tests/rest | |
| parent | Make federation use resource_for_federation as well. (diff) | |
| download | synapse-9a1638ed21ea716b999853c8d63c30073e677c46.tar.xz | |
Removed http_server from HomeServer. Updated unit tests to use either resource_for_federation or resource_for_client depending on what is being tested.
Diffstat (limited to 'tests/rest')
| -rw-r--r-- | tests/rest/test_presence.py | 6 | ||||
| -rw-r--r-- | tests/rest/test_profile.py | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/tests/rest/test_presence.py b/tests/rest/test_presence.py index 98b308dcdb..91d4d1ff6c 100644 --- a/tests/rest/test_presence.py +++ b/tests/rest/test_presence.py @@ -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", diff --git a/tests/rest/test_profile.py b/tests/rest/test_profile.py index 975d32f64d..ff1e92805e 100644 --- a/tests/rest/test_profile.py +++ b/tests/rest/test_profile.py @@ -43,7 +43,6 @@ 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(), |