diff --git a/tests/handlers/test_room_summary.py b/tests/handlers/test_room_summary.py
index e5a6a6c747..7b95844b55 100644
--- a/tests/handlers/test_room_summary.py
+++ b/tests/handlers/test_room_summary.py
@@ -32,7 +32,7 @@ from synapse.handlers.room_summary import _child_events_comparison_key, _RoomEnt
from synapse.rest import admin
from synapse.rest.client import login, room
from synapse.server import HomeServer
-from synapse.types import JsonDict, UserID, create_requester
+from synapse.types import JsonDict, UserID
from tests import unittest
@@ -249,7 +249,7 @@ class SpaceSummaryTestCase(unittest.HomeserverTestCase):
self._assert_rooms(result, expected)
result = self.get_success(
- self.handler.get_room_hierarchy(create_requester(self.user), self.space)
+ self.handler.get_room_hierarchy(self.user, self.space)
)
self._assert_hierarchy(result, expected)
@@ -263,9 +263,7 @@ class SpaceSummaryTestCase(unittest.HomeserverTestCase):
expected = [(self.space, [self.room]), (self.room, ())]
self._assert_rooms(result, expected)
- result = self.get_success(
- self.handler.get_room_hierarchy(create_requester(user2), self.space)
- )
+ result = self.get_success(self.handler.get_room_hierarchy(user2, self.space))
self._assert_hierarchy(result, expected)
# If the space is made invite-only, it should no longer be viewable.
@@ -276,10 +274,7 @@ class SpaceSummaryTestCase(unittest.HomeserverTestCase):
tok=self.token,
)
self.get_failure(self.handler.get_space_summary(user2, self.space), AuthError)
- self.get_failure(
- self.handler.get_room_hierarchy(create_requester(user2), self.space),
- AuthError,
- )
+ self.get_failure(self.handler.get_room_hierarchy(user2, self.space), AuthError)
# If the space is made world-readable it should return a result.
self.helper.send_state(
@@ -291,9 +286,7 @@ class SpaceSummaryTestCase(unittest.HomeserverTestCase):
result = self.get_success(self.handler.get_space_summary(user2, self.space))
self._assert_rooms(result, expected)
- result = self.get_success(
- self.handler.get_room_hierarchy(create_requester(user2), self.space)
- )
+ result = self.get_success(self.handler.get_room_hierarchy(user2, self.space))
self._assert_hierarchy(result, expected)
# Make it not world-readable again and confirm it results in an error.
@@ -304,10 +297,7 @@ class SpaceSummaryTestCase(unittest.HomeserverTestCase):
tok=self.token,
)
self.get_failure(self.handler.get_space_summary(user2, self.space), AuthError)
- self.get_failure(
- self.handler.get_room_hierarchy(create_requester(user2), self.space),
- AuthError,
- )
+ self.get_failure(self.handler.get_room_hierarchy(user2, self.space), AuthError)
# Join the space and results should be returned.
self.helper.invite(self.space, targ=user2, tok=self.token)
@@ -315,9 +305,7 @@ class SpaceSummaryTestCase(unittest.HomeserverTestCase):
result = self.get_success(self.handler.get_space_summary(user2, self.space))
self._assert_rooms(result, expected)
- result = self.get_success(
- self.handler.get_room_hierarchy(create_requester(user2), self.space)
- )
+ result = self.get_success(self.handler.get_room_hierarchy(user2, self.space))
self._assert_hierarchy(result, expected)
# Attempting to view an unknown room returns the same error.
@@ -326,9 +314,7 @@ class SpaceSummaryTestCase(unittest.HomeserverTestCase):
AuthError,
)
self.get_failure(
- self.handler.get_room_hierarchy(
- create_requester(user2), "#not-a-space:" + self.hs.hostname
- ),
+ self.handler.get_room_hierarchy(user2, "#not-a-space:" + self.hs.hostname),
AuthError,
)
@@ -336,10 +322,10 @@ class SpaceSummaryTestCase(unittest.HomeserverTestCase):
"""In-flight room hierarchy requests are deduplicated."""
# Run two `get_room_hierarchy` calls up until they block.
deferred1 = ensureDeferred(
- self.handler.get_room_hierarchy(create_requester(self.user), self.space)
+ self.handler.get_room_hierarchy(self.user, self.space)
)
deferred2 = ensureDeferred(
- self.handler.get_room_hierarchy(create_requester(self.user), self.space)
+ self.handler.get_room_hierarchy(self.user, self.space)
)
# Complete the two calls.
@@ -354,7 +340,7 @@ class SpaceSummaryTestCase(unittest.HomeserverTestCase):
# A subsequent `get_room_hierarchy` call should not reuse the result.
result3 = self.get_success(
- self.handler.get_room_hierarchy(create_requester(self.user), self.space)
+ self.handler.get_room_hierarchy(self.user, self.space)
)
self._assert_hierarchy(result3, expected)
self.assertIsNot(result1, result3)
@@ -373,11 +359,9 @@ class SpaceSummaryTestCase(unittest.HomeserverTestCase):
# Run two `get_room_hierarchy` calls for different users up until they block.
deferred1 = ensureDeferred(
- self.handler.get_room_hierarchy(create_requester(self.user), self.space)
- )
- deferred2 = ensureDeferred(
- self.handler.get_room_hierarchy(create_requester(user2), self.space)
+ self.handler.get_room_hierarchy(self.user, self.space)
)
+ deferred2 = ensureDeferred(self.handler.get_room_hierarchy(user2, self.space))
# Complete the two calls.
result1 = self.get_success(deferred1)
@@ -481,9 +465,7 @@ class SpaceSummaryTestCase(unittest.HomeserverTestCase):
]
self._assert_rooms(result, expected)
- result = self.get_success(
- self.handler.get_room_hierarchy(create_requester(user2), self.space)
- )
+ result = self.get_success(self.handler.get_room_hierarchy(user2, self.space))
self._assert_hierarchy(result, expected)
def test_complex_space(self):
@@ -525,7 +507,7 @@ class SpaceSummaryTestCase(unittest.HomeserverTestCase):
self._assert_rooms(result, expected)
result = self.get_success(
- self.handler.get_room_hierarchy(create_requester(self.user), self.space)
+ self.handler.get_room_hierarchy(self.user, self.space)
)
self._assert_hierarchy(result, expected)
@@ -540,9 +522,7 @@ class SpaceSummaryTestCase(unittest.HomeserverTestCase):
room_ids.append(self.room)
result = self.get_success(
- self.handler.get_room_hierarchy(
- create_requester(self.user), self.space, limit=7
- )
+ self.handler.get_room_hierarchy(self.user, self.space, limit=7)
)
# The result should have the space and all of the links, plus some of the
# rooms and a pagination token.
@@ -554,10 +534,7 @@ class SpaceSummaryTestCase(unittest.HomeserverTestCase):
# Check the next page.
result = self.get_success(
self.handler.get_room_hierarchy(
- create_requester(self.user),
- self.space,
- limit=5,
- from_token=result["next_batch"],
+ self.user, self.space, limit=5, from_token=result["next_batch"]
)
)
# The result should have the space and the room in it, along with a link
@@ -577,22 +554,20 @@ class SpaceSummaryTestCase(unittest.HomeserverTestCase):
room_ids.append(self.room)
result = self.get_success(
- self.handler.get_room_hierarchy(
- create_requester(self.user), self.space, limit=7
- )
+ self.handler.get_room_hierarchy(self.user, self.space, limit=7)
)
self.assertIn("next_batch", result)
# Changing the room ID, suggested-only, or max-depth causes an error.
self.get_failure(
self.handler.get_room_hierarchy(
- create_requester(self.user), self.room, from_token=result["next_batch"]
+ self.user, self.room, from_token=result["next_batch"]
),
SynapseError,
)
self.get_failure(
self.handler.get_room_hierarchy(
- create_requester(self.user),
+ self.user,
self.space,
suggested_only=True,
from_token=result["next_batch"],
@@ -601,19 +576,14 @@ class SpaceSummaryTestCase(unittest.HomeserverTestCase):
)
self.get_failure(
self.handler.get_room_hierarchy(
- create_requester(self.user),
- self.space,
- max_depth=0,
- from_token=result["next_batch"],
+ self.user, self.space, max_depth=0, from_token=result["next_batch"]
),
SynapseError,
)
# An invalid token is ignored.
self.get_failure(
- self.handler.get_room_hierarchy(
- create_requester(self.user), self.space, from_token="foo"
- ),
+ self.handler.get_room_hierarchy(self.user, self.space, from_token="foo"),
SynapseError,
)
@@ -639,18 +609,14 @@ class SpaceSummaryTestCase(unittest.HomeserverTestCase):
# Test just the space itself.
result = self.get_success(
- self.handler.get_room_hierarchy(
- create_requester(self.user), self.space, max_depth=0
- )
+ self.handler.get_room_hierarchy(self.user, self.space, max_depth=0)
)
expected: List[Tuple[str, Iterable[str]]] = [(spaces[0], [rooms[0], spaces[1]])]
self._assert_hierarchy(result, expected)
# A single additional layer.
result = self.get_success(
- self.handler.get_room_hierarchy(
- create_requester(self.user), self.space, max_depth=1
- )
+ self.handler.get_room_hierarchy(self.user, self.space, max_depth=1)
)
expected += [
(rooms[0], ()),
@@ -660,9 +626,7 @@ class SpaceSummaryTestCase(unittest.HomeserverTestCase):
# A few layers.
result = self.get_success(
- self.handler.get_room_hierarchy(
- create_requester(self.user), self.space, max_depth=3
- )
+ self.handler.get_room_hierarchy(self.user, self.space, max_depth=3)
)
expected += [
(rooms[1], ()),
@@ -693,7 +657,7 @@ class SpaceSummaryTestCase(unittest.HomeserverTestCase):
self._assert_rooms(result, expected)
result = self.get_success(
- self.handler.get_room_hierarchy(create_requester(self.user), self.space)
+ self.handler.get_room_hierarchy(self.user, self.space)
)
self._assert_hierarchy(result, expected)
@@ -775,7 +739,7 @@ class SpaceSummaryTestCase(unittest.HomeserverTestCase):
new=summarize_remote_room_hierarchy,
):
result = self.get_success(
- self.handler.get_room_hierarchy(create_requester(self.user), self.space)
+ self.handler.get_room_hierarchy(self.user, self.space)
)
self._assert_hierarchy(result, expected)
@@ -942,7 +906,7 @@ class SpaceSummaryTestCase(unittest.HomeserverTestCase):
new=summarize_remote_room_hierarchy,
):
result = self.get_success(
- self.handler.get_room_hierarchy(create_requester(self.user), self.space)
+ self.handler.get_room_hierarchy(self.user, self.space)
)
self._assert_hierarchy(result, expected)
@@ -1000,7 +964,7 @@ class SpaceSummaryTestCase(unittest.HomeserverTestCase):
new=summarize_remote_room_hierarchy,
):
result = self.get_success(
- self.handler.get_room_hierarchy(create_requester(self.user), self.space)
+ self.handler.get_room_hierarchy(self.user, self.space)
)
self._assert_hierarchy(result, expected)
|
