summary refs log tree commit diff
path: root/tests/utils.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-09-02 10:27:39 +0100
committerErik Johnston <erik@matrix.org>2019-09-02 10:27:39 +0100
commit84532a400906ed9a92e084f18b390b3ad3604c90 (patch)
tree83b899a70368a17bf593db4c5408c3983f5667c5 /tests/utils.py
parentLinting (diff)
parentMerge pull request #5941 from matrix-org/rei/rss_inc7 (diff)
downloadsynapse-84532a400906ed9a92e084f18b390b3ad3604c90.tar.xz
Merge branch 'rei/rss_target' of github.com:matrix-org/synapse into rei/rss_inc8
Diffstat (limited to 'tests/utils.py')
-rw-r--r--tests/utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/utils.py b/tests/utils.py

index f1eb9a545c..46ef2959f2 100644 --- a/tests/utils.py +++ b/tests/utils.py
@@ -464,7 +464,7 @@ class MockHttpResource(HttpServer): args = [urlparse.unquote(u) for u in matcher.groups()] (code, response) = yield func(mock_request, *args) - return (code, response) + return code, response except CodeMessageException as e: return (e.code, cs_error(e.msg, code=e.errcode))