diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-11-27 03:01:04 +0100 |
|---|---|---|
| committer | Amber Brown <hawkowl@atleastfornow.net> | 2018-11-27 13:01:04 +1100 |
| commit | 80527b568d64e402e91a85710e72d99448b4e384 (patch) | |
| tree | 080e2b6b0214cba60b0302212922467f769860b4 | |
| parent | Do a GC after each test to fix logcontext leaks (#4227) (diff) | |
| download | synapse-80527b568d64e402e91a85710e72d99448b4e384.tar.xz | |
Fix more logcontext leaks in tests (#4209)
Diffstat (limited to '')
| -rw-r--r-- | changelog.d/4209.misc | 1 | ||||
| -rw-r--r-- | tests/rest/media/v1/test_media_storage.py | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/changelog.d/4209.misc b/changelog.d/4209.misc new file mode 100644 index 0000000000..efd1f4abd6 --- /dev/null +++ b/changelog.d/4209.misc @@ -0,0 +1 @@ +Fix logcontext leaks in EmailPusher and in tests \ No newline at end of file diff --git a/tests/rest/media/v1/test_media_storage.py b/tests/rest/media/v1/test_media_storage.py index fd131e3454..ad5e9a612f 100644 --- a/tests/rest/media/v1/test_media_storage.py +++ b/tests/rest/media/v1/test_media_storage.py @@ -30,6 +30,7 @@ from synapse.rest.media.v1._base import FileInfo from synapse.rest.media.v1.filepath import MediaFilePaths from synapse.rest.media.v1.media_storage import MediaStorage from synapse.rest.media.v1.storage_provider import FileStorageProviderBackend +from synapse.util.logcontext import make_deferred_yieldable from synapse.util.module_loader import load_module from tests import unittest @@ -113,7 +114,7 @@ class MediaRepoTests(unittest.HomeserverTestCase): d = Deferred() d.addCallback(write_to) self.fetches.append((d, destination, path, args)) - return d + return make_deferred_yieldable(d) client = Mock() client.get_file = get_file |