Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit fd894ae

Browse files
committed
Ignore type assignments for mocked methods
mypy doesn't appear to have a better way to handle this. python/mypy#2427 Convert method assignments to Mock usages were possible.
1 parent 65e1fb7 commit fd894ae

File tree

1 file changed

+33
-27
lines changed

1 file changed

+33
-27
lines changed

tests/handlers/test_typing.py

+33-27
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
from typing import Dict, List, Set, cast
1818
from unittest.mock import ANY, Mock, call
1919

20-
from twisted.internet import defer
2120
from twisted.test.proto_helpers import MemoryReactor
2221
from twisted.web.resource import Resource
2322

@@ -110,24 +109,24 @@ def prepare(self, reactor: MemoryReactor, clock: Clock, hs: HomeServer) -> None:
110109
self.event_source = hs.get_event_sources().sources.typing
111110

112111
self.datastore = hs.get_datastores().main
112+
113113
self.datastore.get_destination_retry_timings = Mock(
114114
return_value=make_awaitable(None)
115115
)
116116

117-
self.datastore.get_device_updates_by_remote = Mock(
117+
self.datastore.get_device_updates_by_remote = Mock( # type: ignore[assignment]
118118
return_value=make_awaitable((0, []))
119119
)
120120

121-
self.datastore.get_destination_last_successful_stream_ordering = Mock(
121+
self.datastore.get_destination_last_successful_stream_ordering = Mock( # type: ignore[assignment]
122122
return_value=make_awaitable(None)
123123
)
124124

125-
def get_received_txn_response(*args):
126-
return defer.succeed(None)
127-
128-
self.datastore.get_received_txn_response = get_received_txn_response
125+
self.datastore.get_received_txn_response = Mock( # type: ignore[assignment]
126+
return_value=make_awaitable(None)
127+
)
129128

130-
self.room_members = []
129+
self.room_members: List[UserID] = []
131130

132131
async def check_user_in_room(room_id: str, requester: Requester) -> None:
133132
if requester.user.to_string() not in [
@@ -136,47 +135,54 @@ async def check_user_in_room(room_id: str, requester: Requester) -> None:
136135
raise AuthError(401, "User is not in the room")
137136
return None
138137

139-
hs.get_auth().check_user_in_room = check_user_in_room
138+
hs.get_auth().check_user_in_room = Mock( # type: ignore[assignment]
139+
side_effect=check_user_in_room
140+
)
140141

141142
async def check_host_in_room(room_id: str, server_name: str) -> bool:
142143
return room_id == ROOM_ID
143144

144-
hs.get_event_auth_handler().is_host_in_room = check_host_in_room
145+
hs.get_event_auth_handler().is_host_in_room = Mock( # type: ignore[assignment]
146+
side_effect=check_host_in_room
147+
)
145148

146-
async def get_current_hosts_in_room(room_id: str):
149+
async def get_current_hosts_in_room(room_id: str) -> Set[str]:
147150
return {member.domain for member in self.room_members}
148151

149-
hs.get_storage_controllers().state.get_current_hosts_in_room = (
150-
get_current_hosts_in_room
152+
hs.get_storage_controllers().state.get_current_hosts_in_room = Mock( # type: ignore[assignment]
153+
side_effect=get_current_hosts_in_room
151154
)
152155

153-
hs.get_storage_controllers().state.get_current_hosts_in_room_or_partial_state_approximation = (
154-
get_current_hosts_in_room
156+
hs.get_storage_controllers().state.get_current_hosts_in_room_or_partial_state_approximation = Mock( # type: ignore[assignment]
157+
side_effect=get_current_hosts_in_room
155158
)
156159

157-
async def get_users_in_room(room_id: str):
160+
async def get_users_in_room(room_id: str) -> Set[str]:
158161
return {str(u) for u in self.room_members}
159162

160-
self.datastore.get_users_in_room = get_users_in_room
163+
self.datastore.get_users_in_room = Mock(side_effect=get_users_in_room)
161164

162-
self.datastore.get_user_directory_stream_pos = Mock(
165+
self.datastore.get_user_directory_stream_pos = Mock( # type: ignore[assignment]
163166
side_effect=(
164-
# we deliberately return a non-None stream pos to avoid doing an initial_spam
167+
# we deliberately return a non-None stream pos to avoid
168+
# doing an initial_sync
165169
lambda: make_awaitable(1)
166170
)
167171
)
168172

169-
self.datastore.get_partial_current_state_deltas = Mock(return_value=(0, None))
173+
self.datastore.get_partial_current_state_deltas = Mock(return_value=(0, None)) # type: ignore[assignment]
170174

171-
self.datastore.get_to_device_stream_token = lambda: 0
172-
self.datastore.get_new_device_msgs_for_remote = (
173-
lambda *args, **kargs: make_awaitable(([], 0))
175+
self.datastore.get_to_device_stream_token = Mock( # type: ignore[assignment]
176+
side_effect=lambda: 0
177+
)
178+
self.datastore.get_new_device_msgs_for_remote = Mock( # type: ignore[assignment]
179+
side_effect=lambda *args, **kargs: make_awaitable(([], 0))
174180
)
175-
self.datastore.delete_device_msgs_for_remote = (
176-
lambda *args, **kargs: make_awaitable(None)
181+
self.datastore.delete_device_msgs_for_remote = Mock( # type: ignore[assignment]
182+
side_effect=lambda *args, **kargs: make_awaitable(None)
177183
)
178-
self.datastore.set_received_txn_response = (
179-
lambda *args, **kwargs: make_awaitable(None)
184+
self.datastore.set_received_txn_response = Mock( # type: ignore[assignment]
185+
side_effect=lambda *args, **kwargs: make_awaitable(None)
180186
)
181187

182188
def test_started_typing_local(self) -> None:

0 commit comments

Comments
 (0)