diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-05-02 10:11:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-02 10:11:59 +0100 |
| commit | 1df2f80367fa90a9ab47bb5bd992c1ac87f3cb80 (patch) | |
| tree | aa634a3c79793a2d85a3343eb81a3b3f51a48cbe /tests/rest/client/v1/test_rooms.py | |
| parent | Merge pull request #5116 from matrix-org/babolivier/account_expiration (diff) | |
| parent | fix examples (diff) | |
| download | synapse-1df2f80367fa90a9ab47bb5bd992c1ac87f3cb80.tar.xz | |
Merge pull request #5119 from matrix-org/rav/admin_api_urls
Move the admin API to `/_synapse/admin/v1`
Diffstat (limited to 'tests/rest/client/v1/test_rooms.py')
| -rw-r--r-- | tests/rest/client/v1/test_rooms.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/rest/client/v1/test_rooms.py b/tests/rest/client/v1/test_rooms.py index 015c144248..1a34924f3e 100644 --- a/tests/rest/client/v1/test_rooms.py +++ b/tests/rest/client/v1/test_rooms.py @@ -22,8 +22,9 @@ from six.moves.urllib import parse as urlparse from twisted.internet import defer +import synapse.rest.admin from synapse.api.constants import Membership -from synapse.rest.client.v1 import admin, login, room +from synapse.rest.client.v1 import login, room from tests import unittest @@ -803,7 +804,7 @@ class RoomMessageListTestCase(RoomBase): class RoomSearchTestCase(unittest.HomeserverTestCase): servlets = [ - admin.register_servlets, + synapse.rest.admin.register_servlets, room.register_servlets, login.register_servlets, ] |