Merge branch 'develop' into rav/pass_site_to_make_request

This commit is contained in:
Richard van der Hoff
2020-11-16 15:22:40 +00:00
committed by GitHub
89 changed files with 147 additions and 120 deletions
+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