summary refs log tree commit diff
path: root/tests/rest/client/v1
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-11-15 22:47:54 +0000
committerRichard van der Hoff <richard@matrix.org>2020-11-16 18:24:00 +0000
commit129ae841e5aebb34a980dd7d118140d08b0ff81d (patch)
tree8b8208ce08d4e6aec002ef02e926ce71bc3ec97c /tests/rest/client/v1
parentFix the URL in the URL preview tests (diff)
downloadsynapse-129ae841e5aebb34a980dd7d118140d08b0ff81d.tar.xz
Make `make_request` actually render the request
remove the stubbing out of `request.process`, so that `requestReceived` also renders the request via the appropriate resource.

Replace render() with a stub for now.
Diffstat (limited to 'tests/rest/client/v1')
-rw-r--r--tests/rest/client/v1/utils.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/rest/client/v1/utils.py b/tests/rest/client/v1/utils.py
index 900852f85b..040a92d6f0 100644
--- a/tests/rest/client/v1/utils.py
+++ b/tests/rest/client/v1/utils.py
@@ -310,7 +310,7 @@ class RestHelper:
         """
         image_length = len(image_data)
         path = "/_matrix/media/r0/upload?filename=%s" % (filename,)
-        request, channel = make_request(
+        _, channel = make_request(
             self.hs.get_reactor(),
             FakeSite(resource),
             "POST",
@@ -319,8 +319,6 @@ class RestHelper:
             access_token=tok,
             custom_headers=[(b"Content-Length", str(image_length))],
         )
-        request.render(resource)
-        self.hs.get_reactor().pump([100])
 
         assert channel.code == expect_code, "Expected: %d, got: %d, resp: %r" % (
             expect_code,