summary refs log tree commit diff
path: root/tests/rest/client/test_identity.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-05-14 11:43:03 +0100
committerBrendan Abolivier <babolivier@matrix.org>2019-05-14 11:43:03 +0100
commitf608ddbe5c58f35b76c5b1199c60a6c17a684d19 (patch)
treecfc254400db8c0d3d9cdcef7942e935b09ba4f1d /tests/rest/client/test_identity.py
parentMerge pull request #5115 from matrix-org/babolivier/lookup_path (diff)
parent0.99.4rc1 (diff)
downloadsynapse-f608ddbe5c58f35b76c5b1199c60a6c17a684d19.tar.xz
Merge branch 'release-v0.99.4' into dinsic dinsic_2019-05-14
Diffstat (limited to 'tests/rest/client/test_identity.py')
-rw-r--r--tests/rest/client/test_identity.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/rest/client/test_identity.py b/tests/rest/client/test_identity.py

index ec260a2873..36bb19a24c 100644 --- a/tests/rest/client/test_identity.py +++ b/tests/rest/client/test_identity.py
@@ -19,7 +19,8 @@ from mock import Mock from twisted.internet import defer -from synapse.rest.client.v1 import admin, login, room +import synapse.rest.admin +from synapse.rest.client.v1 import login, room from synapse.rest.client.v2_alpha import account from tests import unittest @@ -30,7 +31,7 @@ class IdentityDisabledTestCase(unittest.HomeserverTestCase): servlets = [ account.register_servlets, - admin.register_servlets, + synapse.rest.admin.register_servlets_for_client_rest_resource, room.register_servlets, login.register_servlets, ] @@ -109,7 +110,7 @@ class IdentityEnabledTestCase(unittest.HomeserverTestCase): servlets = [ account.register_servlets, - admin.register_servlets, + synapse.rest.admin.register_servlets_for_client_rest_resource, room.register_servlets, login.register_servlets, ] @@ -154,9 +155,7 @@ class IdentityEnabledTestCase(unittest.HomeserverTestCase): "address": "test@example.com", } request_data = json.dumps(params) - request_url = ( - "/rooms/%s/invite" % (room_id) - ).encode('ascii') + request_url = ("/rooms/%s/invite" % (room_id)).encode('ascii') request, channel = self.make_request( b"POST", request_url, request_data, access_token=self.tok, )