summary refs log tree commit diff
path: root/tests/push
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-05-01 15:32:38 +0100
committerRichard van der Hoff <richard@matrix.org>2019-05-01 15:44:30 +0100
commit40e576e29cf6f06d6b5244c5d1df34cf33b1f556 (patch)
treefba1db80c9a79a2abd00c587b861bb37ef7ca31b /tests/push
parentMove admin API to a new prefix (diff)
downloadsynapse-40e576e29cf6f06d6b5244c5d1df34cf33b1f556.tar.xz
Move admin api impl to its own package
It doesn't really belong under rest/client/v1 any more.
Diffstat (limited to 'tests/push')
-rw-r--r--tests/push/test_email.py5
-rw-r--r--tests/push/test_http.py5
2 files changed, 6 insertions, 4 deletions
diff --git a/tests/push/test_email.py b/tests/push/test_email.py
index be3fed8de3..e29bd18ad7 100644
--- a/tests/push/test_email.py
+++ b/tests/push/test_email.py
@@ -19,7 +19,8 @@ import pkg_resources
 
 from twisted.internet.defer import Deferred
 
-from synapse.rest.client.v1 import admin, login, room
+import synapse.rest.admin
+from synapse.rest.client.v1 import login, room
 
 from tests.unittest import HomeserverTestCase
 
@@ -33,7 +34,7 @@ class EmailPusherTests(HomeserverTestCase):
 
     skip = "No Jinja installed" if not load_jinja2_templates else None
     servlets = [
-        admin.register_servlets,
+        synapse.rest.admin.register_servlets,
         room.register_servlets,
         login.register_servlets,
     ]
diff --git a/tests/push/test_http.py b/tests/push/test_http.py
index 6dc45e8506..3f9f56bb79 100644
--- a/tests/push/test_http.py
+++ b/tests/push/test_http.py
@@ -17,7 +17,8 @@ from mock import Mock
 
 from twisted.internet.defer import Deferred
 
-from synapse.rest.client.v1 import admin, login, room
+import synapse.rest.admin
+from synapse.rest.client.v1 import login, room
 from synapse.util.logcontext import make_deferred_yieldable
 
 from tests.unittest import HomeserverTestCase
@@ -32,7 +33,7 @@ class HTTPPusherTests(HomeserverTestCase):
 
     skip = "No Jinja installed" if not load_jinja2_templates else None
     servlets = [
-        admin.register_servlets,
+        synapse.rest.admin.register_servlets,
         room.register_servlets,
         login.register_servlets,
     ]