From 6536eff35950df5daa3f9459a94aaeee662486b8 Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <babolivier@matrix.org>
Date: Wed, 8 May 2019 21:16:23 +0100
Subject: [PATCH 1/3] Fix bogus imports in tests

---
 changelog.d/5154.bugfix                | 1 +
 tests/rest/client/v1/test_directory.py | 4 ++--
 tests/rest/client/v1/test_profile.py   | 5 +++--
 3 files changed, 6 insertions(+), 4 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 000000000000..c7ad9ee1394e
--- /dev/null
+++ b/changelog.d/5154.bugfix
@@ -0,0 +1 @@
+Fix bogus imports.
diff --git a/tests/rest/client/v1/test_directory.py b/tests/rest/client/v1/test_directory.py
index 4804000ec7ac..f63c68e7ed73 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 @@
 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 5d13de11e686..7306e61b7c5b 100644
--- 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,

From 7802d7f4aa1757eda7e1759311a6ec0d930e3b1c Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <babolivier@matrix.org>
Date: Wed, 8 May 2019 21:27:17 +0100
Subject: [PATCH 2/3] Missed one

---
 tests/rest/client/v1/test_rooms.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/rest/client/v1/test_rooms.py b/tests/rest/client/v1/test_rooms.py
index 28fbf6ae5236..9b191436cc09 100644
--- 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,
     ]

From f05f2dda8309b9f6555edb96a1270abc2b5c638d Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <babolivier@matrix.org>
Date: Wed, 8 May 2019 21:27:24 +0100
Subject: [PATCH 3/3] Improve changelog

---
 changelog.d/5154.bugfix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.d/5154.bugfix b/changelog.d/5154.bugfix
index c7ad9ee1394e..c7bd5ee6cf26 100644
--- a/changelog.d/5154.bugfix
+++ b/changelog.d/5154.bugfix
@@ -1 +1 @@
-Fix bogus imports.
+Fix bogus imports in unit tests.