Skip to content

Commit 9116e74

Browse files
committed
Fix logcontext leak in email pusher test
1 parent 3797515 commit 9116e74

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

tests/push/test_email.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131

3232
import synapse.rest.admin
3333
from synapse.api.errors import Codes, SynapseError
34+
from synapse.logging.context import make_deferred_yieldable
3435
from synapse.push.emailpusher import EmailPusher
3536
from synapse.rest.client import login, room
3637
from synapse.rest.synapse.client.unsubscribe import UnsubscribeResource
@@ -88,7 +89,7 @@ def sendmail(*args: Any, **kwargs: Any) -> Deferred:
8889
# This mocks out synapse.reactor.send_email._sendmail.
8990
d: Deferred = Deferred()
9091
self.email_attempts.append((d, args, kwargs))
91-
return d
92+
return make_deferred_yieldable(d)
9293

9394
hs.get_send_email_handler()._sendmail = sendmail # type: ignore[assignment]
9495

0 commit comments

Comments
 (0)