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

Convert additional test-cases to homeserver test case #9396

Merged
merged 6 commits into from
Feb 16, 2021
Merged

Convert additional test-cases to homeserver test case #9396

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b60b2d9
Combine MockHandlerProfileTestCase and ProfileTestCase.
clokep Feb 10, 2021
173e3c6
Convert auth tests to homeserver test case and use async mock.
clokep Feb 11, 2021
81b68e2
Convert the filtering tests to homeserver test case.
clokep Feb 11, 2021
766d38e
Convert appservice handler tests to async.
clokep Feb 11, 2021
c8eca98
Newsfragment
clokep Feb 11, 2021
f6d98db
Py3.5 compatibility.
clokep Feb 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion tests/handlers/test_appservice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

from mock import Mock

from twisted.internet import defer

from synapse.handlers.appservice import ApplicationServicesHandler
from synapse.types import RoomStreamToken

Expand Down Expand Up @@ -124,7 +126,9 @@ def test_query_room_alias_exists(self):
Mock(room_id=room_id, servers=servers)
)

result = self.successResultOf(self.handler.query_room_alias_exists(room_alias))
result = self.successResultOf(
defer.ensureDeferred(self.handler.query_room_alias_exists(room_alias))
)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a difference between self.successResultOf and self.get_success?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

successResultOf doesn't handle async functions on old Twisted. Note that get_success is only available on HomeserverTestCase:

synapse/tests/unittest.py

Lines 480 to 486 in 4b73488

def get_success(self, d, by=0.0):
if inspect.isawaitable(d):
d = ensureDeferred(d)
if not isinstance(d, Deferred):
return d
self.pump(by=by)
return self.successResultOf(d)


self.mock_as_api.query_alias.assert_called_once_with(
interested_service, room_alias_str
Expand Down