diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-07-17 20:43:18 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-17 20:43:18 +1000 |
| commit | bc006b3c9d2a9982bc834ff5d1ec1768c85f907a (patch) | |
| tree | 748864a2aea695a58739c381fb9785a739845972 /synapse | |
| parent | Merge pull request #3544 from matrix-org/erikj/fixup_stream_cache (diff) | |
| download | synapse-bc006b3c9d2a9982bc834ff5d1ec1768c85f907a.tar.xz | |
Refactor REST API tests to use explicit reactors (#3351)
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/http/site.py | 5 | ||||
| -rw-r--r-- | synapse/rest/client/v2_alpha/register.py | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/synapse/http/site.py b/synapse/http/site.py index 41dd974cea..5fd30a4c2c 100644 --- a/synapse/http/site.py +++ b/synapse/http/site.py @@ -42,9 +42,10 @@ class SynapseRequest(Request): which is handling the request, and returns a context manager. """ - def __init__(self, site, *args, **kw): - Request.__init__(self, *args, **kw) + def __init__(self, site, channel, *args, **kw): + Request.__init__(self, channel, *args, **kw) self.site = site + self._channel = channel self.authenticated_entity = None self.start_time = 0 diff --git a/synapse/rest/client/v2_alpha/register.py b/synapse/rest/client/v2_alpha/register.py index 1918897f68..d6cf915d86 100644 --- a/synapse/rest/client/v2_alpha/register.py +++ b/synapse/rest/client/v2_alpha/register.py @@ -643,7 +643,7 @@ class RegisterRestServlet(RestServlet): @defer.inlineCallbacks def _do_guest_registration(self, params): if not self.hs.config.allow_guest_access: - defer.returnValue((403, "Guest access is disabled")) + raise SynapseError(403, "Guest access is disabled") user_id, _ = yield self.registration_handler.register( generate_token=False, make_guest=True |