diff options
| author | Erik Johnston <erik@matrix.org> | 2018-08-09 10:16:16 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-08-09 10:16:16 +0100 |
| commit | 5785b93711da5e61cb6d446d090bb7daac5d61c8 (patch) | |
| tree | e7dc98431b7f52526f85439e785f58a51df89553 /tests/test_server.py | |
| parent | Pull in necessary stores in federation_reader (diff) | |
| parent | Merge pull request #3632 from matrix-org/erikj/refactor_repl_servlet (diff) | |
| download | synapse-5785b93711da5e61cb6d446d090bb7daac5d61c8.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_federation
Diffstat (limited to 'tests/test_server.py')
| -rw-r--r-- | tests/test_server.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tests/test_server.py b/tests/test_server.py index 7e063c0290..fc396226ea 100644 --- a/tests/test_server.py +++ b/tests/test_server.py @@ -1,4 +1,3 @@ -import json import re from twisted.internet.defer import Deferred @@ -104,9 +103,8 @@ class JsonResourceTests(unittest.TestCase): request.render(res) self.assertEqual(channel.result["code"], b'403') - reply_body = json.loads(channel.result["body"]) - self.assertEqual(reply_body["error"], "Forbidden!!one!") - self.assertEqual(reply_body["errcode"], "M_FORBIDDEN") + self.assertEqual(channel.json_body["error"], "Forbidden!!one!") + self.assertEqual(channel.json_body["errcode"], "M_FORBIDDEN") def test_no_handler(self): """ @@ -126,6 +124,5 @@ class JsonResourceTests(unittest.TestCase): request.render(res) self.assertEqual(channel.result["code"], b'400') - reply_body = json.loads(channel.result["body"]) - self.assertEqual(reply_body["error"], "Unrecognized request") - self.assertEqual(reply_body["errcode"], "M_UNRECOGNIZED") + self.assertEqual(channel.json_body["error"], "Unrecognized request") + self.assertEqual(channel.json_body["errcode"], "M_UNRECOGNIZED") |