From d216a36b3703e42906e2242526784598642c8505 Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <babolivier@matrix.org>
Date: Wed, 8 May 2019 21:57:03 +0100
Subject: [PATCH] Fix bogus imports in tests (#5154)

---
 changelog.d/5154.bugfix                | 1 +
 tests/rest/client/v1/test_directory.py | 4 ++--
 tests/rest/client/v1/test_profile.py   | 5 +++--
 tests/rest/client/v1/test_rooms.py     | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 changelog.d/5154.bugfix

diff --git a/changelog.d/5154.bugfix b/changelog.d/5154.bugfix
new file mode 100644
index 000000000..c7bd5ee6c
--- /dev/null
+++ 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
index 4804000ec..f63c68e7e 100644
--- 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 @@ from tests import unittest
 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
index 5d13de11e..7306e61b7 100644
--- a/tests/rest/client/v1/test_profile.py
+++ b/tests/rest/client/v1/test_profile.py
@@ -20,7 +20,8 @@ from twisted.internet import defer
 
 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 @@ class ProfileTestCase(unittest.TestCase):
 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
index 28fbf6ae5..9b191436c 100644
--- a/tests/rest/client/v1/test_rooms.py
+++ b/tests/rest/client/v1/test_rooms.py
@@ -909,7 +909,7 @@ class RoomSearchTestCase(unittest.HomeserverTestCase):
 class PublicRoomsRestrictedTestCase(unittest.HomeserverTestCase):
 
     servlets = [
-        admin.register_servlets,
+        synapse.rest.admin.register_servlets_for_client_rest_resource,
         room.register_servlets,
         login.register_servlets,
     ]