diff options
| author | Erik Johnston <erik@matrix.org> | 2019-12-05 16:40:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-05 16:40:06 +0000 |
| commit | af5d0ebc7243c372c5fa238c421fbd6b9663ff29 (patch) | |
| tree | 819cda313cb340ac08ce4a0a5dab8ed1d0b97948 /tests/utils.py | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| parent | Newsfile (diff) | |
| download | synapse-af5d0ebc7243c372c5fa238c421fbd6b9663ff29.tar.xz | |
Merge pull request #6482 from matrix-org/erikj/port_rest_v1
Port rest/v1 to async/await
Diffstat (limited to 'tests/utils.py')
| -rw-r--r-- | tests/utils.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/utils.py b/tests/utils.py index de2ac1ed33..c57da59191 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -461,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)) |