summary refs log tree commit diff
path: root/tests/test_terms_auth.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-11-08 10:47:56 +0000
committerRichard van der Hoff <richard@matrix.org>2018-11-08 10:47:56 +0000
commitb55cdfaa31bfef1a0a30863f4d46e8b8b9bbcfa6 (patch)
tree4b902e7d5992a7e36a6da6615b10c168cb2dcdc8 /tests/test_terms_auth.py
parentMerge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff)
parentPort hash_password to Python 3 (#4161) (diff)
downloadsynapse-b55cdfaa31bfef1a0a30863f4d46e8b8b9bbcfa6.tar.xz
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'tests/test_terms_auth.py')
-rw-r--r--tests/test_terms_auth.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/test_terms_auth.py b/tests/test_terms_auth.py

index 0b71c6feb9..9ecc3ef14f 100644 --- a/tests/test_terms_auth.py +++ b/tests/test_terms_auth.py
@@ -23,7 +23,6 @@ from synapse.rest.client.v2_alpha.register import register_servlets from synapse.util import Clock from tests import unittest -from tests.server import make_request class TermsTestCase(unittest.HomeserverTestCase): @@ -92,7 +91,7 @@ class TermsTestCase(unittest.HomeserverTestCase): self.registration_handler.check_username = Mock(return_value=True) - request, channel = make_request(b"POST", self.url, request_data) + request, channel = self.make_request(b"POST", self.url, request_data) self.render(request) # We don't bother checking that the response is correct - we'll leave that to @@ -110,7 +109,7 @@ class TermsTestCase(unittest.HomeserverTestCase): }, } ) - request, channel = make_request(b"POST", self.url, request_data) + request, channel = self.make_request(b"POST", self.url, request_data) self.render(request) # We're interested in getting a response that looks like a successful