OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix more logcontext leaks in tests (#4209)

pull/4241/head
Richard van der Hoff 2018-11-27 03:01:04 +01:00 committed by Amber Brown
parent de8772a655
commit 80527b568d
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/4209.misc Normal file
View File

@ -0,0 +1 @@
Fix logcontext leaks in EmailPusher and in tests

3
tests/rest/media/v1/test_media_storage.py
View File

@ -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.filepath import MediaFilePaths
from synapse.rest.media.v1.media_storage import MediaStorage from synapse.rest.media.v1.media_storage import MediaStorage
from synapse.rest.media.v1.storage_provider import FileStorageProviderBackend 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 synapse.util.module_loader import load_module
from tests import unittest from tests import unittest
@ -113,7 +114,7 @@ class MediaRepoTests(unittest.HomeserverTestCase):
d = Deferred() d = Deferred()
d.addCallback(write_to) d.addCallback(write_to)
self.fetches.append((d, destination, path, args)) self.fetches.append((d, destination, path, args))
return d return make_deferred_yieldable(d)
client = Mock() client = Mock()
client.get_file = get_file client.get_file = get_file