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/rest | |
| 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/rest')
| -rw-r--r-- | tests/rest/media/v1/test_url_preview.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/rest/media/v1/test_url_preview.py b/tests/rest/media/v1/test_url_preview.py index 86c813200a..c62f71b44a 100644 --- a/tests/rest/media/v1/test_url_preview.py +++ b/tests/rest/media/v1/test_url_preview.py @@ -20,6 +20,7 @@ from mock import Mock from twisted.internet.defer import Deferred from synapse.config.repository import MediaStorageProviderConfig +from synapse.util.logcontext import make_deferred_yieldable from synapse.util.module_loader import load_module from tests import unittest @@ -77,7 +78,7 @@ class URLPreviewTests(unittest.HomeserverTestCase): d = Deferred() d.addCallback(write_to) self.fetches.append((d, url)) - return d + return make_deferred_yieldable(d) client = Mock() client.get_file = get_file |