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

Commit 3f72c2a

Browse files
Convert ApplicationServiceTestCase to use simple_async_mock (#11880)
1 parent 5c16c33 commit 3f72c2a

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

changelog.d/11880.misc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Convert `ApplicationServiceTestCase` to use `simple_async_mock`.

tests/appservice/test_appservice.py

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
from synapse.appservice import ApplicationService, Namespace
2020

2121
from tests import unittest
22+
from tests.test_utils import simple_async_mock
2223

2324

2425
def _regex(regex: str, exclusive: bool = True) -> Namespace:
@@ -91,10 +92,10 @@ def test_regex_alias_match(self):
9192
self.service.namespaces[ApplicationService.NS_ALIASES].append(
9293
_regex("#irc_.*:matrix.org")
9394
)
94-
self.store.get_aliases_for_room.return_value = defer.succeed(
95+
self.store.get_aliases_for_room = simple_async_mock(
9596
["#irc_foobar:matrix.org", "#athing:matrix.org"]
9697
)
97-
self.store.get_users_in_room.return_value = defer.succeed([])
98+
self.store.get_users_in_room = simple_async_mock([])
9899
self.assertTrue(
99100
(
100101
yield defer.ensureDeferred(
@@ -144,10 +145,10 @@ def test_regex_alias_no_match(self):
144145
self.service.namespaces[ApplicationService.NS_ALIASES].append(
145146
_regex("#irc_.*:matrix.org")
146147
)
147-
self.store.get_aliases_for_room.return_value = defer.succeed(
148+
self.store.get_aliases_for_room = simple_async_mock(
148149
["#xmpp_foobar:matrix.org", "#athing:matrix.org"]
149150
)
150-
self.store.get_users_in_room.return_value = defer.succeed([])
151+
self.store.get_users_in_room = simple_async_mock([])
151152
self.assertFalse(
152153
(
153154
yield defer.ensureDeferred(
@@ -163,10 +164,8 @@ def test_regex_multiple_matches(self):
163164
)
164165
self.service.namespaces[ApplicationService.NS_USERS].append(_regex("@irc_.*"))
165166
self.event.sender = "@irc_foobar:matrix.org"
166-
self.store.get_aliases_for_room.return_value = defer.succeed(
167-
["#irc_barfoo:matrix.org"]
168-
)
169-
self.store.get_users_in_room.return_value = defer.succeed([])
167+
self.store.get_aliases_for_room = simple_async_mock(["#irc_barfoo:matrix.org"])
168+
self.store.get_users_in_room = simple_async_mock([])
170169
self.assertTrue(
171170
(
172171
yield defer.ensureDeferred(
@@ -191,10 +190,10 @@ def test_interested_in_self(self):
191190
def test_member_list_match(self):
192191
self.service.namespaces[ApplicationService.NS_USERS].append(_regex("@irc_.*"))
193192
# Note that @irc_fo:here is the AS user.
194-
self.store.get_users_in_room.return_value = defer.succeed(
193+
self.store.get_users_in_room = simple_async_mock(
195194
["@alice:here", "@irc_fo:here", "@bob:here"]
196195
)
197-
self.store.get_aliases_for_room.return_value = defer.succeed([])
196+
self.store.get_aliases_for_room = simple_async_mock([])
198197

199198
self.event.sender = "@xmpp_foobar:matrix.org"
200199
self.assertTrue(

0 commit comments

Comments
 (0)