Remove redundant calls to render()

This commit is contained in:
Richard van der Hoff 2020-11-15 22:49:21 +00:00
parent 129ae841e5
commit be8fa65d0b
13 changed files with 32 additions and 106 deletions

View File

@ -15,7 +15,7 @@
from synapse.app.generic_worker import GenericWorkerServer from synapse.app.generic_worker import GenericWorkerServer
from tests.server import make_request, render from tests.server import make_request
from tests.unittest import HomeserverTestCase from tests.unittest import HomeserverTestCase
@ -56,10 +56,8 @@ class FrontendProxyTests(HomeserverTestCase):
# Grab the resource from the site that was told to listen # Grab the resource from the site that was told to listen
self.assertEqual(len(self.reactor.tcpServers), 1) self.assertEqual(len(self.reactor.tcpServers), 1)
site = self.reactor.tcpServers[0][1] site = self.reactor.tcpServers[0][1]
resource = site.resource.children[b"_matrix"].children[b"client"]
request, channel = make_request(self.reactor, site, "PUT", "presence/a/status") _, channel = make_request(self.reactor, site, "PUT", "presence/a/status")
render(request, resource, self.reactor)
# 400 + unrecognised, because nothing is registered # 400 + unrecognised, because nothing is registered
self.assertEqual(channel.code, 400) self.assertEqual(channel.code, 400)
@ -78,10 +76,8 @@ class FrontendProxyTests(HomeserverTestCase):
# Grab the resource from the site that was told to listen # Grab the resource from the site that was told to listen
self.assertEqual(len(self.reactor.tcpServers), 1) self.assertEqual(len(self.reactor.tcpServers), 1)
site = self.reactor.tcpServers[0][1] site = self.reactor.tcpServers[0][1]
resource = site.resource.children[b"_matrix"].children[b"client"]
request, channel = make_request(self.reactor, site, "PUT", "presence/a/status") _, channel = make_request(self.reactor, site, "PUT", "presence/a/status")
render(request, resource, self.reactor)
# 401, because the stub servlet still checks authentication # 401, because the stub servlet still checks authentication
self.assertEqual(channel.code, 401) self.assertEqual(channel.code, 401)

View File

@ -20,7 +20,7 @@ from synapse.app.generic_worker import GenericWorkerServer
from synapse.app.homeserver import SynapseHomeServer from synapse.app.homeserver import SynapseHomeServer
from synapse.config.server import parse_listener_def from synapse.config.server import parse_listener_def
from tests.server import make_request, render from tests.server import make_request
from tests.unittest import HomeserverTestCase from tests.unittest import HomeserverTestCase
@ -67,16 +67,15 @@ class FederationReaderOpenIDListenerTests(HomeserverTestCase):
# Grab the resource from the site that was told to listen # Grab the resource from the site that was told to listen
site = self.reactor.tcpServers[0][1] site = self.reactor.tcpServers[0][1]
try: try:
resource = site.resource.children[b"_matrix"].children[b"federation"] site.resource.children[b"_matrix"].children[b"federation"]
except KeyError: except KeyError:
if expectation == "no_resource": if expectation == "no_resource":
return return
raise raise
request, channel = make_request( _, channel = make_request(
self.reactor, site, "GET", "/_matrix/federation/v1/openid/userinfo" self.reactor, site, "GET", "/_matrix/federation/v1/openid/userinfo"
) )
render(request, resource, self.reactor)
self.assertEqual(channel.code, 401) self.assertEqual(channel.code, 401)
@ -116,15 +115,14 @@ class SynapseHomeserverOpenIDListenerTests(HomeserverTestCase):
# Grab the resource from the site that was told to listen # Grab the resource from the site that was told to listen
site = self.reactor.tcpServers[0][1] site = self.reactor.tcpServers[0][1]
try: try:
resource = site.resource.children[b"_matrix"].children[b"federation"] site.resource.children[b"_matrix"].children[b"federation"]
except KeyError: except KeyError:
if expectation == "no_resource": if expectation == "no_resource":
return return
raise raise
request, channel = make_request( _, channel = make_request(
self.reactor, site, "GET", "/_matrix/federation/v1/openid/userinfo" self.reactor, site, "GET", "/_matrix/federation/v1/openid/userinfo"
) )
render(request, resource, self.reactor)
self.assertEqual(channel.code, 401) self.assertEqual(channel.code, 401)

View File

@ -17,7 +17,7 @@
from synapse.http.additional_resource import AdditionalResource from synapse.http.additional_resource import AdditionalResource
from synapse.http.server import respond_with_json from synapse.http.server import respond_with_json
from tests.server import FakeSite, make_request, render from tests.server import FakeSite, make_request
from tests.unittest import HomeserverTestCase from tests.unittest import HomeserverTestCase
@ -47,7 +47,6 @@ class AdditionalResourceTests(HomeserverTestCase):
resource = AdditionalResource(self.hs, handler) resource = AdditionalResource(self.hs, handler)
request, channel = make_request(self.reactor, FakeSite(resource), "GET", "/") request, channel = make_request(self.reactor, FakeSite(resource), "GET", "/")
render(request, resource, self.reactor)
self.assertEqual(request.code, 200) self.assertEqual(request.code, 200)
self.assertEqual(channel.json_body, {"some_key": "some_value_async"}) self.assertEqual(channel.json_body, {"some_key": "some_value_async"})
@ -57,7 +56,6 @@ class AdditionalResourceTests(HomeserverTestCase):
resource = AdditionalResource(self.hs, handler) resource = AdditionalResource(self.hs, handler)
request, channel = make_request(self.reactor, FakeSite(resource), "GET", "/") request, channel = make_request(self.reactor, FakeSite(resource), "GET", "/")
render(request, resource, self.reactor)
self.assertEqual(request.code, 200) self.assertEqual(request.code, 200)
self.assertEqual(channel.json_body, {"some_key": "some_value_sync"}) self.assertEqual(channel.json_body, {"some_key": "some_value_sync"})

View File

@ -36,7 +36,7 @@ from synapse.server import HomeServer
from synapse.util import Clock from synapse.util import Clock
from tests import unittest from tests import unittest
from tests.server import FakeTransport, render from tests.server import FakeTransport
try: try:
import hiredis import hiredis
@ -347,9 +347,6 @@ class BaseMultiWorkerStreamTestCase(unittest.HomeserverTestCase):
config["worker_replication_http_port"] = "8765" config["worker_replication_http_port"] = "8765"
return config return config
def render_on_worker(self, worker_hs: HomeServer, request: SynapseRequest):
render(request, self._hs_to_site[worker_hs].resource, self.reactor)
def replicate(self): def replicate(self):
"""Tell the master side of replication that something has happened, and then """Tell the master side of replication that something has happened, and then
wait for the replication to occur. wait for the replication to occur.

View File

@ -55,7 +55,6 @@ class ClientReaderTestCase(BaseMultiWorkerStreamTestCase):
"register", "register",
{"username": "user", "type": "m.login.password", "password": "bar"}, {"username": "user", "type": "m.login.password", "password": "bar"},
) # type: SynapseRequest, FakeChannel ) # type: SynapseRequest, FakeChannel
self.render_on_worker(worker_hs, request_1)
self.assertEqual(request_1.code, 401) self.assertEqual(request_1.code, 401)
# Grab the session # Grab the session
@ -69,7 +68,6 @@ class ClientReaderTestCase(BaseMultiWorkerStreamTestCase):
"register", "register",
{"auth": {"session": session, "type": "m.login.dummy"}}, {"auth": {"session": session, "type": "m.login.dummy"}},
) # type: SynapseRequest, FakeChannel ) # type: SynapseRequest, FakeChannel
self.render_on_worker(worker_hs, request_2)
self.assertEqual(request_2.code, 200) self.assertEqual(request_2.code, 200)
# We're given a registered user. # We're given a registered user.
@ -89,7 +87,6 @@ class ClientReaderTestCase(BaseMultiWorkerStreamTestCase):
"register", "register",
{"username": "user", "type": "m.login.password", "password": "bar"}, {"username": "user", "type": "m.login.password", "password": "bar"},
) # type: SynapseRequest, FakeChannel ) # type: SynapseRequest, FakeChannel
self.render_on_worker(worker_hs_1, request_1)
self.assertEqual(request_1.code, 401) self.assertEqual(request_1.code, 401)
# Grab the session # Grab the session
@ -104,7 +101,6 @@ class ClientReaderTestCase(BaseMultiWorkerStreamTestCase):
"register", "register",
{"auth": {"session": session, "type": "m.login.dummy"}}, {"auth": {"session": session, "type": "m.login.dummy"}},
) # type: SynapseRequest, FakeChannel ) # type: SynapseRequest, FakeChannel
self.render_on_worker(worker_hs_2, request_2)
self.assertEqual(request_2.code, 200) self.assertEqual(request_2.code, 200)
# We're given a registered user. # We're given a registered user.

View File

@ -183,7 +183,6 @@ class EventPersisterShardTestCase(BaseMultiWorkerStreamTestCase):
request, channel = make_request( request, channel = make_request(
self.reactor, sync_hs_site, "GET", "/sync", access_token=access_token self.reactor, sync_hs_site, "GET", "/sync", access_token=access_token
) )
self.render_on_worker(sync_hs, request)
next_batch = channel.json_body["next_batch"] next_batch = channel.json_body["next_batch"]
# We now gut wrench into the events stream MultiWriterIdGenerator on # We now gut wrench into the events stream MultiWriterIdGenerator on
@ -214,7 +213,6 @@ class EventPersisterShardTestCase(BaseMultiWorkerStreamTestCase):
"/sync?since={}".format(next_batch), "/sync?since={}".format(next_batch),
access_token=access_token, access_token=access_token,
) )
self.render_on_worker(sync_hs, request)
# We should only see the new event and nothing else # We should only see the new event and nothing else
self.assertIn(room_id1, channel.json_body["rooms"]["join"]) self.assertIn(room_id1, channel.json_body["rooms"]["join"])
@ -245,7 +243,6 @@ class EventPersisterShardTestCase(BaseMultiWorkerStreamTestCase):
"/sync?since={}".format(vector_clock_token), "/sync?since={}".format(vector_clock_token),
access_token=access_token, access_token=access_token,
) )
self.render_on_worker(sync_hs, request)
self.assertNotIn(room_id1, channel.json_body["rooms"]["join"]) self.assertNotIn(room_id1, channel.json_body["rooms"]["join"])
self.assertIn(room_id2, channel.json_body["rooms"]["join"]) self.assertIn(room_id2, channel.json_body["rooms"]["join"])
@ -271,7 +268,6 @@ class EventPersisterShardTestCase(BaseMultiWorkerStreamTestCase):
"/sync?since={}".format(next_batch), "/sync?since={}".format(next_batch),
access_token=access_token, access_token=access_token,
) )
self.render_on_worker(sync_hs, request)
prev_batch1 = channel.json_body["rooms"]["join"][room_id1]["timeline"][ prev_batch1 = channel.json_body["rooms"]["join"][room_id1]["timeline"][
"prev_batch" "prev_batch"
@ -292,7 +288,6 @@ class EventPersisterShardTestCase(BaseMultiWorkerStreamTestCase):
), ),
access_token=access_token, access_token=access_token,
) )
self.render_on_worker(sync_hs, request)
self.assertListEqual([], channel.json_body["chunk"]) self.assertListEqual([], channel.json_body["chunk"])
# Paginating back on the second room should produce the first event # Paginating back on the second room should produce the first event
@ -306,7 +301,6 @@ class EventPersisterShardTestCase(BaseMultiWorkerStreamTestCase):
), ),
access_token=access_token, access_token=access_token,
) )
self.render_on_worker(sync_hs, request)
self.assertEqual(len(channel.json_body["chunk"]), 1) self.assertEqual(len(channel.json_body["chunk"]), 1)
self.assertEqual( self.assertEqual(
channel.json_body["chunk"][0]["event_id"], first_event_in_room2 channel.json_body["chunk"][0]["event_id"], first_event_in_room2
@ -322,7 +316,6 @@ class EventPersisterShardTestCase(BaseMultiWorkerStreamTestCase):
), ),
access_token=access_token, access_token=access_token,
) )
self.render_on_worker(sync_hs, request)
self.assertListEqual([], channel.json_body["chunk"]) self.assertListEqual([], channel.json_body["chunk"])
request, channel = make_request( request, channel = make_request(
@ -334,7 +327,6 @@ class EventPersisterShardTestCase(BaseMultiWorkerStreamTestCase):
), ),
access_token=access_token, access_token=access_token,
) )
self.render_on_worker(sync_hs, request)
self.assertEqual(len(channel.json_body["chunk"]), 1) self.assertEqual(len(channel.json_body["chunk"]), 1)
self.assertEqual( self.assertEqual(
channel.json_body["chunk"][0]["event_id"], first_event_in_room2 channel.json_body["chunk"][0]["event_id"], first_event_in_room2

View File

@ -21,7 +21,7 @@ from synapse.rest.client.v1 import login, room
from synapse.rest.consent import consent_resource from synapse.rest.consent import consent_resource
from tests import unittest from tests import unittest
from tests.server import FakeSite, make_request, render from tests.server import FakeSite, make_request
class ConsentResourceTestCase(unittest.HomeserverTestCase): class ConsentResourceTestCase(unittest.HomeserverTestCase):
@ -64,7 +64,6 @@ class ConsentResourceTestCase(unittest.HomeserverTestCase):
request, channel = make_request( request, channel = make_request(
self.reactor, FakeSite(resource), "GET", "/consent?v=1", shorthand=False self.reactor, FakeSite(resource), "GET", "/consent?v=1", shorthand=False
) )
render(request, resource, self.reactor)
self.assertEqual(channel.code, 200) self.assertEqual(channel.code, 200)
def test_accept_consent(self): def test_accept_consent(self):
@ -91,7 +90,6 @@ class ConsentResourceTestCase(unittest.HomeserverTestCase):
access_token=access_token, access_token=access_token,
shorthand=False, shorthand=False,
) )
render(request, resource, self.reactor)
self.assertEqual(channel.code, 200) self.assertEqual(channel.code, 200)
# Get the version from the body, and whether we've consented # Get the version from the body, and whether we've consented
@ -107,7 +105,6 @@ class ConsentResourceTestCase(unittest.HomeserverTestCase):
access_token=access_token, access_token=access_token,
shorthand=False, shorthand=False,
) )
render(request, resource, self.reactor)
self.assertEqual(channel.code, 200) self.assertEqual(channel.code, 200)
# Fetch the consent page, to get the consent version -- it should have # Fetch the consent page, to get the consent version -- it should have
@ -120,7 +117,6 @@ class ConsentResourceTestCase(unittest.HomeserverTestCase):
access_token=access_token, access_token=access_token,
shorthand=False, shorthand=False,
) )
render(request, resource, self.reactor)
self.assertEqual(channel.code, 200) self.assertEqual(channel.code, 200)
# Get the version from the body, and check that it's the version we # Get the version from the body, and check that it's the version we

View File

@ -27,7 +27,7 @@ from twisted.web.server import Site
from synapse.api.constants import Membership from synapse.api.constants import Membership
from tests.server import FakeSite, make_request, render from tests.server import FakeSite, make_request
@attr.s @attr.s
@ -52,14 +52,13 @@ class RestHelper:
if tok: if tok:
path = path + "?access_token=%s" % tok path = path + "?access_token=%s" % tok
request, channel = make_request( _, channel = make_request(
self.hs.get_reactor(), self.hs.get_reactor(),
self.site, self.site,
"POST", "POST",
path, path,
json.dumps(content).encode("utf8"), json.dumps(content).encode("utf8"),
) )
render(request, self.site.resource, self.hs.get_reactor())
assert channel.result["code"] == b"%d" % expect_code, channel.result assert channel.result["code"] == b"%d" % expect_code, channel.result
self.auth_user_id = temp_id self.auth_user_id = temp_id
@ -129,7 +128,7 @@ class RestHelper:
data = {"membership": membership} data = {"membership": membership}
data.update(extra_data) data.update(extra_data)
request, channel = make_request( _, channel = make_request(
self.hs.get_reactor(), self.hs.get_reactor(),
self.site, self.site,
"PUT", "PUT",
@ -137,8 +136,6 @@ class RestHelper:
json.dumps(data).encode("utf8"), json.dumps(data).encode("utf8"),
) )
render(request, self.site.resource, self.hs.get_reactor())
assert int(channel.result["code"]) == expect_code, ( assert int(channel.result["code"]) == expect_code, (
"Expected: %d, got: %d, resp: %r" "Expected: %d, got: %d, resp: %r"
% (expect_code, int(channel.result["code"]), channel.result["body"]) % (expect_code, int(channel.result["code"]), channel.result["body"])
@ -166,14 +163,13 @@ class RestHelper:
if tok: if tok:
path = path + "?access_token=%s" % tok path = path + "?access_token=%s" % tok
request, channel = make_request( _, channel = make_request(
self.hs.get_reactor(), self.hs.get_reactor(),
self.site, self.site,
"PUT", "PUT",
path, path,
json.dumps(content).encode("utf8"), json.dumps(content).encode("utf8"),
) )
render(request, self.site.resource, self.hs.get_reactor())
assert int(channel.result["code"]) == expect_code, ( assert int(channel.result["code"]) == expect_code, (
"Expected: %d, got: %d, resp: %r" "Expected: %d, got: %d, resp: %r"
@ -223,12 +219,10 @@ class RestHelper:
if body is not None: if body is not None:
content = json.dumps(body).encode("utf8") content = json.dumps(body).encode("utf8")
request, channel = make_request( _, channel = make_request(
self.hs.get_reactor(), self.site, method, path, content self.hs.get_reactor(), self.site, method, path, content
) )
render(request, self.site.resource, self.hs.get_reactor())
assert int(channel.result["code"]) == expect_code, ( assert int(channel.result["code"]) == expect_code, (
"Expected: %d, got: %d, resp: %r" "Expected: %d, got: %d, resp: %r"
% (expect_code, int(channel.result["code"]), channel.result["body"]) % (expect_code, int(channel.result["code"]), channel.result["body"])

View File

@ -320,10 +320,8 @@ class SyncTypingTests(unittest.HomeserverTestCase):
typing._reset() typing._reset()
# Now it SHOULD fail as it never completes! # Now it SHOULD fail as it never completes!
request, channel = self.make_request( with self.assertRaises(TimedOutException):
"GET", sync_url % (access_token, next_batch) self.make_request("GET", sync_url % (access_token, next_batch))
)
self.assertRaises(TimedOutException, self.render, request)
class UnreadMessagesTestCase(unittest.HomeserverTestCase): class UnreadMessagesTestCase(unittest.HomeserverTestCase):

View File

@ -19,7 +19,6 @@ from twisted.internet.interfaces import (
) )
from twisted.python.failure import Failure from twisted.python.failure import Failure
from twisted.test.proto_helpers import AccumulatingProtocol, MemoryReactorClock from twisted.test.proto_helpers import AccumulatingProtocol, MemoryReactorClock
from twisted.web.http import unquote
from twisted.web.http_headers import Headers from twisted.web.http_headers import Headers
from twisted.web.resource import IResource from twisted.web.resource import IResource
from twisted.web.server import Site from twisted.web.server import Site
@ -267,10 +266,6 @@ def make_request(
return req, channel return req, channel
def render(request, resource, clock):
pass
@implementer(IReactorPluggableNameResolver) @implementer(IReactorPluggableNameResolver)
class ThreadedMemoryReactorClock(MemoryReactorClock): class ThreadedMemoryReactorClock(MemoryReactorClock):
""" """

View File

@ -412,7 +412,7 @@ class ClientIpAuthTestCase(unittest.HomeserverTestCase):
headers1 = {b"User-Agent": b"Mozzila pizza"} headers1 = {b"User-Agent": b"Mozzila pizza"}
headers1.update(headers) headers1.update(headers)
request, channel = make_request( make_request(
self.reactor, self.reactor,
self.site, self.site,
"GET", "GET",
@ -421,7 +421,6 @@ class ClientIpAuthTestCase(unittest.HomeserverTestCase):
custom_headers=headers1.items(), custom_headers=headers1.items(),
**make_request_args, **make_request_args,
) )
self.render(request)
# Advance so the save loop occurs # Advance so the save loop occurs
self.reactor.advance(100) self.reactor.advance(100)

View File

@ -29,7 +29,6 @@ from tests.server import (
FakeSite, FakeSite,
ThreadedMemoryReactorClock, ThreadedMemoryReactorClock,
make_request, make_request,
render,
setup_test_homeserver, setup_test_homeserver,
) )
@ -65,7 +64,6 @@ class JsonResourceTests(unittest.TestCase):
request, channel = make_request( request, channel = make_request(
self.reactor, FakeSite(res), b"GET", b"/_matrix/foo/%E2%98%83?a=%E2%98%83" self.reactor, FakeSite(res), b"GET", b"/_matrix/foo/%E2%98%83?a=%E2%98%83"
) )
render(request, res, self.reactor)
self.assertEqual(request.args, {b"a": ["\N{SNOWMAN}".encode("utf8")]}) self.assertEqual(request.args, {b"a": ["\N{SNOWMAN}".encode("utf8")]})
self.assertEqual(got_kwargs, {"room_id": "\N{SNOWMAN}"}) self.assertEqual(got_kwargs, {"room_id": "\N{SNOWMAN}"})
@ -84,10 +82,7 @@ class JsonResourceTests(unittest.TestCase):
"GET", [re.compile("^/_matrix/foo$")], _callback, "test_servlet" "GET", [re.compile("^/_matrix/foo$")], _callback, "test_servlet"
) )
request, channel = make_request( _, channel = make_request(self.reactor, FakeSite(res), b"GET", b"/_matrix/foo")
self.reactor, FakeSite(res), b"GET", b"/_matrix/foo"
)
render(request, res, self.reactor)
self.assertEqual(channel.result["code"], b"500") self.assertEqual(channel.result["code"], b"500")
@ -111,10 +106,7 @@ class JsonResourceTests(unittest.TestCase):
"GET", [re.compile("^/_matrix/foo$")], _callback, "test_servlet" "GET", [re.compile("^/_matrix/foo$")], _callback, "test_servlet"
) )
request, channel = make_request( _, channel = make_request(self.reactor, FakeSite(res), b"GET", b"/_matrix/foo")
self.reactor, FakeSite(res), b"GET", b"/_matrix/foo"
)
render(request, res, self.reactor)
self.assertEqual(channel.result["code"], b"500") self.assertEqual(channel.result["code"], b"500")
@ -132,10 +124,7 @@ class JsonResourceTests(unittest.TestCase):
"GET", [re.compile("^/_matrix/foo$")], _callback, "test_servlet" "GET", [re.compile("^/_matrix/foo$")], _callback, "test_servlet"
) )
request, channel = make_request( _, channel = make_request(self.reactor, FakeSite(res), b"GET", b"/_matrix/foo")
self.reactor, FakeSite(res), b"GET", b"/_matrix/foo"
)
render(request, res, self.reactor)
self.assertEqual(channel.result["code"], b"403") self.assertEqual(channel.result["code"], b"403")
self.assertEqual(channel.json_body["error"], "Forbidden!!one!") self.assertEqual(channel.json_body["error"], "Forbidden!!one!")
@ -157,10 +146,9 @@ class JsonResourceTests(unittest.TestCase):
"GET", [re.compile("^/_matrix/foo$")], _callback, "test_servlet" "GET", [re.compile("^/_matrix/foo$")], _callback, "test_servlet"
) )
request, channel = make_request( _, channel = make_request(
self.reactor, FakeSite(res), b"GET", b"/_matrix/foobar" self.reactor, FakeSite(res), b"GET", b"/_matrix/foobar"
) )
render(request, res, self.reactor)
self.assertEqual(channel.result["code"], b"400") self.assertEqual(channel.result["code"], b"400")
self.assertEqual(channel.json_body["error"], "Unrecognized request") self.assertEqual(channel.json_body["error"], "Unrecognized request")
@ -182,10 +170,7 @@ class JsonResourceTests(unittest.TestCase):
) )
# The path was registered as GET, but this is a HEAD request. # The path was registered as GET, but this is a HEAD request.
request, channel = make_request( _, channel = make_request(self.reactor, FakeSite(res), b"HEAD", b"/_matrix/foo")
self.reactor, FakeSite(res), b"HEAD", b"/_matrix/foo"
)
render(request, res, self.reactor)
self.assertEqual(channel.result["code"], b"200") self.assertEqual(channel.result["code"], b"200")
self.assertNotIn("body", channel.result) self.assertNotIn("body", channel.result)
@ -216,16 +201,8 @@ class OptionsResourceTests(unittest.TestCase):
"1.0", "1.0",
) )
request, channel = make_request( # render the request and return the channel
self.reactor, site, method, path, shorthand=False _, channel = make_request(self.reactor, site, method, path, shorthand=False)
)
request.prepath = [] # This doesn't get set properly by make_request.
request.site = site
resource = site.getResourceFor(request)
# Finally, render the resource and return the channel.
render(request, resource, self.reactor)
return channel return channel
def test_unknown_options_request(self): def test_unknown_options_request(self):
@ -298,8 +275,7 @@ class WrapHtmlRequestHandlerTests(unittest.TestCase):
res = WrapHtmlRequestHandlerTests.TestResource() res = WrapHtmlRequestHandlerTests.TestResource()
res.callback = callback res.callback = callback
request, channel = make_request(self.reactor, FakeSite(res), b"GET", b"/path") _, channel = make_request(self.reactor, FakeSite(res), b"GET", b"/path")
render(request, res, self.reactor)
self.assertEqual(channel.result["code"], b"200") self.assertEqual(channel.result["code"], b"200")
body = channel.result["body"] body = channel.result["body"]
@ -317,8 +293,7 @@ class WrapHtmlRequestHandlerTests(unittest.TestCase):
res = WrapHtmlRequestHandlerTests.TestResource() res = WrapHtmlRequestHandlerTests.TestResource()
res.callback = callback res.callback = callback
request, channel = make_request(self.reactor, FakeSite(res), b"GET", b"/path") _, channel = make_request(self.reactor, FakeSite(res), b"GET", b"/path")
render(request, res, self.reactor)
self.assertEqual(channel.result["code"], b"301") self.assertEqual(channel.result["code"], b"301")
headers = channel.result["headers"] headers = channel.result["headers"]
@ -339,8 +314,7 @@ class WrapHtmlRequestHandlerTests(unittest.TestCase):
res = WrapHtmlRequestHandlerTests.TestResource() res = WrapHtmlRequestHandlerTests.TestResource()
res.callback = callback res.callback = callback
request, channel = make_request(self.reactor, FakeSite(res), b"GET", b"/path") _, channel = make_request(self.reactor, FakeSite(res), b"GET", b"/path")
render(request, res, self.reactor)
self.assertEqual(channel.result["code"], b"304") self.assertEqual(channel.result["code"], b"304")
headers = channel.result["headers"] headers = channel.result["headers"]
@ -359,8 +333,7 @@ class WrapHtmlRequestHandlerTests(unittest.TestCase):
res = WrapHtmlRequestHandlerTests.TestResource() res = WrapHtmlRequestHandlerTests.TestResource()
res.callback = callback res.callback = callback
request, channel = make_request(self.reactor, FakeSite(res), b"HEAD", b"/path") _, channel = make_request(self.reactor, FakeSite(res), b"HEAD", b"/path")
render(request, res, self.reactor)
self.assertEqual(channel.result["code"], b"200") self.assertEqual(channel.result["code"], b"200")
self.assertNotIn("body", channel.result) self.assertNotIn("body", channel.result)

View File

@ -48,13 +48,7 @@ from synapse.server import HomeServer
from synapse.types import UserID, create_requester from synapse.types import UserID, create_requester
from synapse.util.ratelimitutils import FederationRateLimiter from synapse.util.ratelimitutils import FederationRateLimiter
from tests.server import ( from tests.server import FakeChannel, get_clock, make_request, setup_test_homeserver
FakeChannel,
get_clock,
make_request,
render,
setup_test_homeserver,
)
from tests.test_utils import event_injection, setup_awaitable_errors from tests.test_utils import event_injection, setup_awaitable_errors
from tests.test_utils.logging_setup import setup_logging from tests.test_utils.logging_setup import setup_logging
from tests.utils import default_config, setupdb from tests.utils import default_config, setupdb
@ -454,7 +448,7 @@ class HomeserverTestCase(TestCase):
Args: Args:
request (synapse.http.site.SynapseRequest): The request to render. request (synapse.http.site.SynapseRequest): The request to render.
""" """
render(request, self.resource, self.reactor) pass
def setup_test_homeserver(self, *args, **kwargs): def setup_test_homeserver(self, *args, **kwargs):
""" """