summary refs log tree commit diff
path: root/tests/rest/client/v1/test_profile.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-01-23 10:55:18 +0000
committerMark Haines <mjark@negativecurvature.net>2015-01-23 10:55:18 +0000
commit7dfd99f16354801ed51a3a5a99b3ea6db1e670d4 (patch)
treec43a9fe9ca6d8713e376f56e5689bf71aa53f03d /tests/rest/client/v1/test_profile.py
parentRename MockedDatastoreTestCase to MockedDatastorePresenceTestCase since it is... (diff)
parentMerge rest servlets into the client json resource object (diff)
downloadsynapse-7dfd99f16354801ed51a3a5a99b3ea6db1e670d4.tar.xz
Merge pull request #31 from matrix-org/client_api_resource
Merge rest servlets into the client json resource object
Diffstat (limited to 'tests/rest/client/v1/test_profile.py')
-rw-r--r--tests/rest/client/v1/test_profile.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/rest/client/v1/test_profile.py b/tests/rest/client/v1/test_profile.py
index 47cfb10a6d..5b5c3edc22 100644
--- a/tests/rest/client/v1/test_profile.py
+++ b/tests/rest/client/v1/test_profile.py
@@ -25,6 +25,8 @@ from ....utils import MockHttpResource, MockKey
 from synapse.api.errors import SynapseError, AuthError
 from synapse.server import HomeServer
 
+from synapse.rest.client.v1 import profile
+
 myid = "@1234ABCD:test"
 PATH_PREFIX = "/_matrix/client/api/v1"
 
@@ -61,7 +63,7 @@ class ProfileTestCase(unittest.TestCase):
 
         hs.get_handlers().profile_handler = self.mock_handler
 
-        hs.register_servlets()
+        profile.register_servlets(hs, self.mock_resource)
 
     @defer.inlineCallbacks
     def test_get_my_name(self):