diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-12-05 21:00:43 +0000 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2019-12-05 21:00:43 +0000 |
| commit | e126d83f7401456152e07042f8e8b7587adfe1b4 (patch) | |
| tree | fc1a5fcabb0c4094166070cfd5d802cf2cd35546 /tests/utils.py | |
| parent | Merge branch 'develop' into babolivier/msc1802 (diff) | |
| parent | Replace /admin/v1/users_paginate endpoint with /admin/v2/users (#5925) (diff) | |
| download | synapse-e126d83f7401456152e07042f8e8b7587adfe1b4.tar.xz | |
Merge branch 'develop' into babolivier/msc1802
Diffstat (limited to 'tests/utils.py')
| -rw-r--r-- | tests/utils.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/utils.py b/tests/utils.py index 7dc9bdc505..c57da59191 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -109,6 +109,7 @@ def default_config(name, parse=False): """ config_dict = { "server_name": name, + "send_federation": False, "media_store_path": "media", "uploads_path": "uploads", # the test signing key is just an arbitrary ed25519 key to keep the config @@ -460,7 +461,9 @@ class MockHttpResource(HttpServer): try: args = [urlparse.unquote(u) for u in matcher.groups()] - (code, response) = yield func(mock_request, *args) + (code, response) = yield defer.ensureDeferred( + func(mock_request, *args) + ) return code, response except CodeMessageException as e: return (e.code, cs_error(e.msg, code=e.errcode)) |