diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-11-20 12:19:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-20 12:19:19 +0100 |
| commit | 416c671474d719d793e6d35c7b7247c566ba9ec8 (patch) | |
| tree | 622fd94127b169cc3c2a5038e88bdc9cd0d385da /tests/test_server.py | |
| parent | Merge remote-tracking branch 'origin/master' into develop (diff) | |
| parent | changelog (diff) | |
| download | synapse-416c671474d719d793e6d35c7b7247c566ba9ec8.tar.xz | |
Merge pull request #4204 from matrix-org/rav/logcontext_leak_fixes
Fix some logcontext leaks
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) |