summary refs log tree commit diff
path: root/tests/test_server.py
diff options
context:
space:
mode:
authorOlivier Wilkinson (reivilibre) <olivier@librepush.net>2019-08-30 17:32:09 +0100
committerOlivier Wilkinson (reivilibre) <olivier@librepush.net>2019-08-30 17:32:09 +0100
commitffc30b8f60995ed515bcb87eb480a79be143f0d0 (patch)
treebc873f6e36b2a1b51f7d1472f5ed546cd43bdd1f /tests/test_server.py
parentMerge pull request #5924 from matrix-org/rei/rss_inc6 (diff)
parentRevert "Add m.id_access_token flag (#5930)" (#5945) (diff)
downloadsynapse-ffc30b8f60995ed515bcb87eb480a79be143f0d0.tar.xz
Merge branch 'develop' into rei/rss_target
Diffstat (limited to '')
-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(