diff options
| author | Sean Quah <8349537+squahtx@users.noreply.github.com> | 2022-04-27 14:58:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-27 14:58:26 +0100 |
| commit | 78b99de7c206b106340e12cdee0af9aa246bd5ad (patch) | |
| tree | 7eb94bb066b8ed0b23fa160056b5e9bcdb29dd8e /tests/federation | |
| parent | Add a module API to allow modules to edit push rule actions (#12406) (diff) | |
| download | synapse-78b99de7c206b106340e12cdee0af9aa246bd5ad.tar.xz | |
Prefer `make_awaitable` over `defer.succeed` in tests (#12505)
When configuring the return values of mocks, prefer awaitables from `make_awaitable` over `defer.succeed`. `Deferred`s are only awaitable once, so it is inappropriate for a mock to return the same `Deferred` multiple times. Also update `run_in_background` to support functions that return arbitrary awaitables. Signed-off-by: Sean Quah <seanq@element.io>
Diffstat (limited to 'tests/federation')
| -rw-r--r-- | tests/federation/test_federation_client.py | 2 | ||||
| -rw-r--r-- | tests/federation/test_federation_sender.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/federation/test_federation_client.py b/tests/federation/test_federation_client.py index ec8864dafe..268a48d7ba 100644 --- a/tests/federation/test_federation_client.py +++ b/tests/federation/test_federation_client.py @@ -83,7 +83,7 @@ class FederationClientTest(FederatingHomeserverTestCase): ) # mock up the response, and have the agent return it - self._mock_agent.request.return_value = defer.succeed( + self._mock_agent.request.side_effect = lambda *args, **kwargs: defer.succeed( _mock_response( { "pdus": [ diff --git a/tests/federation/test_federation_sender.py b/tests/federation/test_federation_sender.py index 91f982518e..6b26353d5e 100644 --- a/tests/federation/test_federation_sender.py +++ b/tests/federation/test_federation_sender.py @@ -226,7 +226,7 @@ class FederationSenderDevicesTestCases(HomeserverTestCase): # Send the server a device list EDU for the other user, this will cause # it to try and resync the device lists. self.hs.get_federation_transport_client().query_user_devices.return_value = ( - defer.succeed( + make_awaitable( { "stream_id": "1", "user_id": "@user2:host2", |