19
19
from synapse .appservice import ApplicationService , Namespace
20
20
21
21
from tests import unittest
22
+ from tests .test_utils import simple_async_mock
22
23
23
24
24
25
def _regex (regex : str , exclusive : bool = True ) -> Namespace :
@@ -91,10 +92,10 @@ def test_regex_alias_match(self):
91
92
self .service .namespaces [ApplicationService .NS_ALIASES ].append (
92
93
_regex ("#irc_.*:matrix.org" )
93
94
)
94
- self .store .get_aliases_for_room . return_value = defer . succeed (
95
+ self .store .get_aliases_for_room = simple_async_mock (
95
96
["#irc_foobar:matrix.org" , "#athing:matrix.org" ]
96
97
)
97
- self .store .get_users_in_room . return_value = defer . succeed ([])
98
+ self .store .get_users_in_room = simple_async_mock ([])
98
99
self .assertTrue (
99
100
(
100
101
yield defer .ensureDeferred (
@@ -144,10 +145,10 @@ def test_regex_alias_no_match(self):
144
145
self .service .namespaces [ApplicationService .NS_ALIASES ].append (
145
146
_regex ("#irc_.*:matrix.org" )
146
147
)
147
- self .store .get_aliases_for_room . return_value = defer . succeed (
148
+ self .store .get_aliases_for_room = simple_async_mock (
148
149
["#xmpp_foobar:matrix.org" , "#athing:matrix.org" ]
149
150
)
150
- self .store .get_users_in_room . return_value = defer . succeed ([])
151
+ self .store .get_users_in_room = simple_async_mock ([])
151
152
self .assertFalse (
152
153
(
153
154
yield defer .ensureDeferred (
@@ -163,10 +164,8 @@ def test_regex_multiple_matches(self):
163
164
)
164
165
self .service .namespaces [ApplicationService .NS_USERS ].append (_regex ("@irc_.*" ))
165
166
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 ([])
170
169
self .assertTrue (
171
170
(
172
171
yield defer .ensureDeferred (
@@ -191,10 +190,10 @@ def test_interested_in_self(self):
191
190
def test_member_list_match (self ):
192
191
self .service .namespaces [ApplicationService .NS_USERS ].append (_regex ("@irc_.*" ))
193
192
# 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 (
195
194
["@alice:here" , "@irc_fo:here" , "@bob:here" ]
196
195
)
197
- self .store .get_aliases_for_room . return_value = defer . succeed ([])
196
+ self .store .get_aliases_for_room = simple_async_mock ([])
198
197
199
198
self .event .sender = "@xmpp_foobar:matrix.org"
200
199
self .assertTrue (
0 commit comments