summary refs log tree commit diff
path: root/tests/test_server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-09-04 13:13:30 +0100
committerErik Johnston <erik@matrix.org>2019-09-04 13:13:30 +0100
commite80a5b7492d13e8b24a8c989ca25ad379dd9cf44 (patch)
treef16072be557cebe1bc386cb2f66ce15a7b002fbe /tests/test_server.py
parentMerge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff)
parentFix and refactor room and user stats (#5971) (diff)
downloadsynapse-e80a5b7492d13e8b24a8c989ca25ad379dd9cf44.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'tests/test_server.py')
-rw-r--r--tests/test_server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test_server.py b/tests/test_server.py

index 2a7d407c98..98fef21d55 100644 --- a/tests/test_server.py +++ b/tests/test_server.py
@@ -57,7 +57,7 @@ class JsonResourceTests(unittest.TestCase): def _callback(request, **kwargs): got_kwargs.update(kwargs) - return (200, kwargs) + return 200, kwargs res = JsonResource(self.homeserver) res.register_paths(