diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-11-15 22:46:51 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-11-19 17:07:01 +0000 |
| commit | 884a56144762385c64e6815c961d0d67ff47cc2f (patch) | |
| tree | 4444598043d304cec59c1c5241fbfea9b8527cfc /tests/test_server.py | |
| parent | Fix logcontext leak in EmailPusher (diff) | |
| download | synapse-884a56144762385c64e6815c961d0d67ff47cc2f.tar.xz | |
Fix some tests which leaked logcontexts
Diffstat (limited to 'tests/test_server.py')
| -rw-r--r-- | tests/test_server.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/test_server.py b/tests/test_server.py index f0e6291b7e..634a8fbca5 100644 --- a/tests/test_server.py +++ b/tests/test_server.py @@ -27,6 +27,7 @@ from synapse.api.errors import Codes, SynapseError from synapse.http.server import JsonResource from synapse.http.site import SynapseSite, logger from synapse.util import Clock +from synapse.util.logcontext import make_deferred_yieldable from tests import unittest from tests.server import FakeTransport, make_request, render, setup_test_homeserver @@ -95,7 +96,7 @@ class JsonResourceTests(unittest.TestCase): d = Deferred() d.addCallback(_throw) self.reactor.callLater(1, d.callback, True) - return d + return make_deferred_yieldable(d) res = JsonResource(self.homeserver) res.register_paths("GET", [re.compile("^/_matrix/foo$")], _callback) |