diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-08-15 23:43:41 +1000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-08-15 15:12:23 +0100 |
| commit | a87af25fbb9d8938b1557ef42e31edecf1ee731c (patch) | |
| tree | c10a6153c617891edb6fbb20933c2166e35057b6 /tests/rest/client/v1/utils.py | |
| parent | Use a producer to stream back responses (diff) | |
| download | synapse-a87af25fbb9d8938b1557ef42e31edecf1ee731c.tar.xz | |
Fix the tests
Diffstat (limited to 'tests/rest/client/v1/utils.py')
| -rw-r--r-- | tests/rest/client/v1/utils.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/rest/client/v1/utils.py b/tests/rest/client/v1/utils.py index 9f862f9dfa..40dc4ea256 100644 --- a/tests/rest/client/v1/utils.py +++ b/tests/rest/client/v1/utils.py @@ -23,7 +23,7 @@ from twisted.internet import defer from synapse.api.constants import Membership from tests import unittest -from tests.server import make_request, wait_until_result +from tests.server import make_request, render class RestTestCase(unittest.TestCase): @@ -171,8 +171,7 @@ class RestHelper(object): request, channel = make_request( "POST", path, json.dumps(content).encode('utf8') ) - request.render(self.resource) - wait_until_result(self.hs.get_reactor(), channel) + render(request, self.resource, self.hs.get_reactor()) assert channel.result["code"] == b"200", channel.result self.auth_user_id = temp_id @@ -220,8 +219,7 @@ class RestHelper(object): request, channel = make_request("PUT", path, json.dumps(data).encode('utf8')) - request.render(self.resource) - wait_until_result(self.hs.get_reactor(), channel) + render(request, self.resource, self.hs.get_reactor()) assert int(channel.result["code"]) == expect_code, ( "Expected: %d, got: %d, resp: %r" |