summary refs log tree commit diff
path: root/tests/storage/test_client_ips.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-05-02 10:11:59 +0100
committerGitHub <noreply@github.com>2019-05-02 10:11:59 +0100
commit1df2f80367fa90a9ab47bb5bd992c1ac87f3cb80 (patch)
treeaa634a3c79793a2d85a3343eb81a3b3f51a48cbe /tests/storage/test_client_ips.py
parentMerge pull request #5116 from matrix-org/babolivier/account_expiration (diff)
parentfix examples (diff)
downloadsynapse-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/storage/test_client_ips.py')
-rw-r--r--tests/storage/test_client_ips.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/storage/test_client_ips.py b/tests/storage/test_client_ips.py

index 858efe4992..b0f6fd34d8 100644 --- a/tests/storage/test_client_ips.py +++ b/tests/storage/test_client_ips.py
@@ -18,8 +18,9 @@ from mock import Mock from twisted.internet import defer +import synapse.rest.admin from synapse.http.site import XForwardedForRequest -from synapse.rest.client.v1 import admin, login +from synapse.rest.client.v1 import login from tests import unittest @@ -205,7 +206,7 @@ class ClientIpStoreTestCase(unittest.HomeserverTestCase): class ClientIpAuthTestCase(unittest.HomeserverTestCase): - servlets = [admin.register_servlets, login.register_servlets] + servlets = [synapse.rest.admin.register_servlets, login.register_servlets] def make_homeserver(self, reactor, clock): hs = self.setup_test_homeserver()