Merge branch 'develop' into anoa/blacklist_fixes

* develop: Fix bogus imports in tests (#5154)
matrix-org · May 8, 2019 · ab87ab6 · ab87ab6
2 parents f5faea9 + d216a36
commit ab87ab6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/changelog.d/5154.bugfix b/changelog.d/5154.bugfix
@@ -0,0 +1 @@
+Fix bogus imports in unit tests.
diff --git a/tests/rest/client/v1/test_directory.py b/tests/rest/client/v1/test_directory.py
@@ -15,7 +15,7 @@
 
 import json
 
-from synapse.rest.admin import register_servlets
+from synapse.rest import admin
 from synapse.rest.client.v1 import directory, login, room
 from synapse.types import RoomAlias
 from synapse.util.stringutils import random_string
@@ -26,7 +26,7 @@
 class DirectoryTestCase(unittest.HomeserverTestCase):
 
     servlets = [
-        register_servlets,
+        admin.register_servlets_for_client_rest_resource,
         directory.register_servlets,
         login.register_servlets,
         room.register_servlets,

diff --git a/tests/rest/client/v1/test_profile.py b/tests/rest/client/v1/test_profile.py
@@ -20,7 +20,8 @@
 
 import synapse.types
 from synapse.api.errors import AuthError, SynapseError
-from synapse.rest.client.v1 import admin, login, profile, room
+from synapse.rest import admin
+from synapse.rest.client.v1 import login, profile, room
 
 from tests import unittest
 
@@ -161,7 +162,7 @@ def test_set_my_avatar(self):
 class ProfilesRestrictedTestCase(unittest.HomeserverTestCase):
 
     servlets = [
-        admin.register_servlets,
+        admin.register_servlets_for_client_rest_resource,
         login.register_servlets,
         profile.register_servlets,
         room.register_servlets,

diff --git a/tests/rest/client/v1/test_rooms.py b/tests/rest/client/v1/test_rooms.py
@@ -909,7 +909,7 @@ def test_include_context(self):
 class PublicRoomsRestrictedTestCase(unittest.HomeserverTestCase):
 
     servlets = [
-        admin.register_servlets,
+        synapse.rest.admin.register_servlets_for_client_rest_resource,
         room.register_servlets,
         login.register_servlets,
     ]