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/push/test_http.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/push/test_http.py')
| -rw-r--r-- | tests/push/test_http.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/push/test_http.py b/tests/push/test_http.py index addc01ab7f..6dc45e8506 100644 --- a/tests/push/test_http.py +++ b/tests/push/test_http.py @@ -18,6 +18,7 @@ from mock import Mock from twisted.internet.defer import Deferred from synapse.rest.client.v1 import admin, login, room +from synapse.util.logcontext import make_deferred_yieldable from tests.unittest import HomeserverTestCase @@ -47,7 +48,7 @@ class HTTPPusherTests(HomeserverTestCase): def post_json_get_json(url, body): d = Deferred() self.push_attempts.append((d, url, body)) - return d + return make_deferred_yieldable(d) m.post_json_get_json = post_json_get_json |