summary refs log tree commit diff
path: root/tests/unittest.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-03-21 12:41:42 +0000
committerErik Johnston <erik@matrix.org>2019-03-21 12:41:42 +0000
commit0f0671e5e08b79364e88b8abbfaf77a304a277a4 (patch)
tree9188b8d2574889cdd6bd3a324dc8cbc44983fa16 /tests/unittest.py
parentMerge pull request #4875 from matrix-org/erikj/spam_checker (diff)
parentMerge pull request #4904 from matrix-org/erikj/fix_shutdown (diff)
downloadsynapse-0f0671e5e08b79364e88b8abbfaf77a304a277a4.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/dinsic-merged
Diffstat (limited to 'tests/unittest.py')
-rw-r--r--tests/unittest.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/unittest.py b/tests/unittest.py

index fac254ff10..7772a47078 100644 --- a/tests/unittest.py +++ b/tests/unittest.py
@@ -262,6 +262,7 @@ class HomeserverTestCase(TestCase): access_token=None, request=SynapseRequest, shorthand=True, + federation_auth_origin=None, ): """ Create a SynapseRequest at the path using the method and containing the @@ -275,15 +276,18 @@ class HomeserverTestCase(TestCase): a dict. shorthand: Whether to try and be helpful and prefix the given URL with the usual REST API path, if it doesn't contain it. + federation_auth_origin (bytes|None): if set to not-None, we will add a fake + Authorization header pretenting to be the given server name. Returns: - A synapse.http.site.SynapseRequest. + Tuple[synapse.http.site.SynapseRequest, channel] """ if isinstance(content, dict): content = json.dumps(content).encode('utf8') return make_request( - self.reactor, method, path, content, access_token, request, shorthand + self.reactor, method, path, content, access_token, request, shorthand, + federation_auth_origin, ) def render(self, request): @@ -326,10 +330,10 @@ class HomeserverTestCase(TestCase): """ self.reactor.pump([by] * 100) - def get_success(self, d): + def get_success(self, d, by=0.0): if not isinstance(d, Deferred): return d - self.pump() + self.pump(by=by) return self.successResultOf(d) def register_user(self, username, password, admin=False):