mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-09-08 07:12:04 +00:00
Fixup tests
This commit is contained in:
parent
1a0997bbd5
commit
4ca3ef10b9
@ -15,6 +15,8 @@
|
||||
|
||||
from mock import Mock
|
||||
|
||||
from twisted.internet import defer
|
||||
|
||||
from synapse.rest.client.v1 import presence
|
||||
from synapse.types import UserID
|
||||
|
||||
@ -36,6 +38,7 @@ class PresenceTestCase(unittest.HomeserverTestCase):
|
||||
)
|
||||
|
||||
hs.presence_handler = Mock()
|
||||
hs.presence_handler.set_state.return_value = defer.succeed(None)
|
||||
|
||||
return hs
|
||||
|
||||
|
@ -52,6 +52,14 @@ class MockHandlerProfileTestCase(unittest.TestCase):
|
||||
]
|
||||
)
|
||||
|
||||
self.mock_handler.get_displayname.return_value = defer.succeed(Mock())
|
||||
self.mock_handler.set_displayname.return_value = defer.succeed(Mock())
|
||||
self.mock_handler.get_avatar_url.return_value = defer.succeed(Mock())
|
||||
self.mock_handler.set_avatar_url.return_value = defer.succeed(Mock())
|
||||
self.mock_handler.check_profile_query_allowed.return_value = defer.succeed(
|
||||
Mock()
|
||||
)
|
||||
|
||||
hs = yield setup_test_homeserver(
|
||||
self.addCleanup,
|
||||
"test",
|
||||
@ -63,7 +71,7 @@ class MockHandlerProfileTestCase(unittest.TestCase):
|
||||
)
|
||||
|
||||
def _get_user_by_req(request=None, allow_guest=False):
|
||||
return synapse.types.create_requester(myid)
|
||||
return defer.succeed(synapse.types.create_requester(myid))
|
||||
|
||||
hs.get_auth().get_user_by_req = _get_user_by_req
|
||||
|
||||
|
@ -461,7 +461,9 @@ class MockHttpResource(HttpServer):
|
||||
try:
|
||||
args = [urlparse.unquote(u) for u in matcher.groups()]
|
||||
|
||||
(code, response) = yield func(mock_request, *args)
|
||||
(code, response) = yield defer.ensureDeferred(
|
||||
func(mock_request, *args)
|
||||
)
|
||||
return code, response
|
||||
except CodeMessageException as e:
|
||||
return (e.code, cs_error(e.msg, code=e.errcode))
|
||||
|
Loading…
Reference in New Issue
Block a user