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
+1 -1
View File
@@ -36,7 +36,7 @@ from tests.server import FakeSite, make_request
class VersionTestCase(unittest.HomeserverTestCase):
url = "/_synapse/admin/v1/server_version"
def create_test_json_resource(self):
def create_test_resource(self):
resource = JsonResource(self.hs)
VersionServlet(self.hs).register(resource)
return resource