summary refs log tree commit diff
path: root/tests/rest/client/v2_alpha
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-10-25 17:33:15 +0100
committerGitHub <noreply@github.com>2016-10-25 17:33:15 +0100
commit177f104432b3ab124bb0ae0b7e0e1c2eeae2f492 (patch)
tree0118fd2870598a004d7439f67e21c8651f425643 /tests/rest/client/v2_alpha
parentMerge branch 'release-v0.18.2' of github.com:matrix-org/synapse into develop (diff)
parentMerge branch 'develop' into markjh/bearer_token (diff)
downloadsynapse-177f104432b3ab124bb0ae0b7e0e1c2eeae2f492.tar.xz
Merge pull request #1098 from matrix-org/markjh/bearer_token
Allow clients to supply access_tokens as headers
Diffstat (limited to 'tests/rest/client/v2_alpha')
-rw-r--r--tests/rest/client/v2_alpha/test_register.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/rest/client/v2_alpha/test_register.py b/tests/rest/client/v2_alpha/test_register.py

index e9cb416e4b..b4a787c436 100644 --- a/tests/rest/client/v2_alpha/test_register.py +++ b/tests/rest/client/v2_alpha/test_register.py
@@ -3,6 +3,7 @@ from synapse.api.errors import SynapseError from twisted.internet import defer from mock import Mock from tests import unittest +from tests.utils import mock_getRawHeaders import json @@ -16,6 +17,7 @@ class RegisterRestServletTestCase(unittest.TestCase): path='/_matrix/api/v2_alpha/register' ) self.request.args = {} + self.request.requestHeaders.getRawHeaders = mock_getRawHeaders() self.appservice = None self.auth = Mock(get_appservice_by_req=Mock(