diff options
| author | Emmanuel ROHEE <erohee@amdocs.com> | 2014-08-14 11:36:50 +0200 |
|---|---|---|
| committer | Emmanuel ROHEE <erohee@amdocs.com> | 2014-08-14 11:36:50 +0200 |
| commit | d05ff3e0985d40f2a5fd6c095178f75aebf53220 (patch) | |
| tree | 44c323d736e3e91d7cd38a9f6ea5f54c465f8990 /tests/federation/test_federation.py | |
| parent | Created m-file-input. A directive to open a file selection dialog on whatever... (diff) | |
| parent | Honour the -w flag to enable the web client at /matrix/client (diff) | |
| download | synapse-d05ff3e0985d40f2a5fd6c095178f75aebf53220.tar.xz | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'tests/federation/test_federation.py')
| -rw-r--r-- | tests/federation/test_federation.py | 2 |
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, |