diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-08-17 14:58:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-17 14:58:45 +0100 |
| commit | 63260397c6ab6925da0ba3bd24d398001cd8208b (patch) | |
| tree | 3ef57e48328cd2364afee5810f83d550e0304f8a /tests/rest/client/v1/utils.py | |
| parent | Merge pull request #3700 from matrix-org/rav/wait_for_producers (diff) | |
| parent | changelog (diff) | |
| download | synapse-63260397c6ab6925da0ba3bd24d398001cd8208b.tar.xz | |
Merge pull request #3701 from matrix-org/rav/use_producer_for_responses
Use a producer to stream back responses
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" |