dandri/synapse
1
0 Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2026-10-22 13:12:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into rav/pass_site_to_make_request

Browse Source
This commit is contained in:
Richard van der Hoff authored and GitHub committed 2020-11-16 15:22:40 +00:00
2 parents 0d33c53534 791d7cd6f0
commit bebfb9a97b
89 files changed
+147 -120
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/replication/_base.py
+2 -2
View File
@@ -240,8 +240,8 @@ class BaseMultiWorkerStreamTestCase(unittest.HomeserverTestCase):
lambda: self._handle_http_replication_attempt(self.hs, 8765),
)
def create_test_json_resource(self):
"""Overrides `HomeserverTestCase.create_test_json_resource`.
def create_test_resource(self):
"""Overrides `HomeserverTestCase.create_test_resource`.
"""
# We override this so that it automatically registers all the HTTP
# replication servlets, without having to explicitly do that in all