summary refs log tree commit diff
path: root/tests/federation
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-08-14 10:18:54 +0100
committerKegan Dougal <kegan@matrix.org>2014-08-14 10:18:54 +0100
commit9a1638ed21ea716b999853c8d63c30073e677c46 (patch)
tree60c79cacb7e6b0df578141fc6b4c1a111f983686 /tests/federation
parentMake federation use resource_for_federation as well. (diff)
downloadsynapse-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/federation')
-rw-r--r--tests/federation/test_federation.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/federation/test_federation.py b/tests/federation/test_federation.py
index ec39c7ee33..478ddd879e 100644
--- a/tests/federation/test_federation.py
+++ b/tests/federation/test_federation.py
@@ -70,7 +70,7 @@ class FederationTestCase(unittest.TestCase):
         )
         self.clock = MockClock()
         hs = HomeServer("test",
-                http_server=self.mock_http_server,
+                resource_for_federation=self.mock_http_server,
                 http_client=self.mock_http_client,
                 db_pool=None,
                 datastore=self.mock_persistence,