diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2019-07-04 00:07:04 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-04 00:07:04 +1000 |
| commit | 463b072b1290a8cb75bc1d7b6688fa76bbfdb14f (patch) | |
| tree | b3b3f1807e74ff1aa23f48384c4d64a165975131 /tests/rest/media/v1 | |
| parent | Fix 'utime went backwards' errors on daemonization. (#5609) (diff) | |
| download | synapse-463b072b1290a8cb75bc1d7b6688fa76bbfdb14f.tar.xz | |
Move logging utilities out of the side drawer of util/ and into logging/ (#5606)
Diffstat (limited to 'tests/rest/media/v1')
| -rw-r--r-- | tests/rest/media/v1/test_media_storage.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/rest/media/v1/test_media_storage.py b/tests/rest/media/v1/test_media_storage.py index 39c9342423..bc662b61db 100644 --- a/tests/rest/media/v1/test_media_storage.py +++ b/tests/rest/media/v1/test_media_storage.py @@ -24,11 +24,11 @@ from six.moves.urllib import parse from twisted.internet.defer import Deferred +from synapse.logging.context import make_deferred_yieldable 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 tests import unittest |