diff options
author | Hubert Chathi <hubert@uhoreg.ca> | 2019-09-04 16:56:29 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-04 16:56:29 -0700 |
commit | 19bb5c80241782dbb257aabb40094c1aa8c22847 (patch) | |
tree | 97fdf219de3ed852dfe3e35aebe98a4f1122a9ba /tests/test_server.py | |
parent | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged (diff) | |
parent | add user signature stream change cache to slaved device store (diff) | |
download | synapse-19bb5c80241782dbb257aabb40094c1aa8c22847.tar.xz |
Merge pull request #5769 from matrix-org/uhoreg/e2e_cross-signing2-part1
Cross-signing [2/4] - upload/download keys
Diffstat (limited to 'tests/test_server.py')
-rw-r--r-- | tests/test_server.py | 2 |
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( |