OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Convert `ApplicationServiceTestCase` to use `simple_async_mock` (#11880)

pull/11884/head
Andrew Morgan 2022-02-01 17:45:13 +00:00 committed by GitHub
parent 5c16c33021
commit 3f72c2a322
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/11880.misc Normal file
View File

@ -0,0 +1 @@
Convert `ApplicationServiceTestCase` to use `simple_async_mock`.

19
tests/appservice/test_appservice.py
View File

@ -19,6 +19,7 @@ from twisted.internet import defer
from synapse.appservice import ApplicationService, Namespace from synapse.appservice import ApplicationService, Namespace
from tests import unittest from tests import unittest
from tests.test_utils import simple_async_mock
def _regex(regex: str, exclusive: bool = True) -> Namespace: def _regex(regex: str, exclusive: bool = True) -> Namespace:
@ -91,10 +92,10 @@ class ApplicationServiceTestCase(unittest.TestCase):
self.service.namespaces[ApplicationService.NS_ALIASES].append( self.service.namespaces[ApplicationService.NS_ALIASES].append(
_regex("#irc_.*:matrix.org") _regex("#irc_.*:matrix.org")
) )
self.store.get_aliases_for_room.return_value = defer.succeed( self.store.get_aliases_for_room = simple_async_mock(
["#irc_foobar:matrix.org", "#athing:matrix.org"] ["#irc_foobar:matrix.org", "#athing:matrix.org"]
) )
self.store.get_users_in_room.return_value = defer.succeed([]) self.store.get_users_in_room = simple_async_mock([])
self.assertTrue( self.assertTrue(
( (
yield defer.ensureDeferred( yield defer.ensureDeferred(
@ -144,10 +145,10 @@ class ApplicationServiceTestCase(unittest.TestCase):
self.service.namespaces[ApplicationService.NS_ALIASES].append( self.service.namespaces[ApplicationService.NS_ALIASES].append(
_regex("#irc_.*:matrix.org") _regex("#irc_.*:matrix.org")
) )
self.store.get_aliases_for_room.return_value = defer.succeed( self.store.get_aliases_for_room = simple_async_mock(
["#xmpp_foobar:matrix.org", "#athing:matrix.org"] ["#xmpp_foobar:matrix.org", "#athing:matrix.org"]
) )
self.store.get_users_in_room.return_value = defer.succeed([]) self.store.get_users_in_room = simple_async_mock([])
self.assertFalse( self.assertFalse(
( (
yield defer.ensureDeferred( yield defer.ensureDeferred(
@ -163,10 +164,8 @@ class ApplicationServiceTestCase(unittest.TestCase):
) )
self.service.namespaces[ApplicationService.NS_USERS].append(_regex("@irc_.*")) self.service.namespaces[ApplicationService.NS_USERS].append(_regex("@irc_.*"))
self.event.sender = "@irc_foobar:matrix.org" self.event.sender = "@irc_foobar:matrix.org"
self.store.get_aliases_for_room.return_value = defer.succeed( self.store.get_aliases_for_room = simple_async_mock(["#irc_barfoo:matrix.org"])
["#irc_barfoo:matrix.org"] self.store.get_users_in_room = simple_async_mock([])
)
self.store.get_users_in_room.return_value = defer.succeed([])
self.assertTrue( self.assertTrue(
( (
yield defer.ensureDeferred( yield defer.ensureDeferred(
@ -191,10 +190,10 @@ class ApplicationServiceTestCase(unittest.TestCase):
def test_member_list_match(self): def test_member_list_match(self):
self.service.namespaces[ApplicationService.NS_USERS].append(_regex("@irc_.*")) self.service.namespaces[ApplicationService.NS_USERS].append(_regex("@irc_.*"))
# Note that @irc_fo:here is the AS user. # Note that @irc_fo:here is the AS user.
self.store.get_users_in_room.return_value = defer.succeed( self.store.get_users_in_room = simple_async_mock(
["@alice:here", "@irc_fo:here", "@bob:here"] ["@alice:here", "@irc_fo:here", "@bob:here"]
) )
self.store.get_aliases_for_room.return_value = defer.succeed([]) self.store.get_aliases_for_room = simple_async_mock([])
self.event.sender = "@xmpp_foobar:matrix.org" self.event.sender = "@xmpp_foobar:matrix.org"
self.assertTrue( self.assertTrue(