diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2020-07-30 19:00:29 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2020-07-30 19:00:29 +0100 |
| commit | 69158e554f30ac8b6b646a62fa496a2c0005dea6 (patch) | |
| tree | 42fdb177abede9c0128906d4e6661cde0ee9cd6c /tests/rest/admin/test_admin.py | |
| parent | Changelog (diff) | |
| parent | Update workers docs (#7990) (diff) | |
| download | synapse-69158e554f30ac8b6b646a62fa496a2c0005dea6.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/new_push_rules
Diffstat (limited to 'tests/rest/admin/test_admin.py')
| -rw-r--r-- | tests/rest/admin/test_admin.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/rest/admin/test_admin.py b/tests/rest/admin/test_admin.py index b1a4decced..0f1144fe1e 100644 --- a/tests/rest/admin/test_admin.py +++ b/tests/rest/admin/test_admin.py @@ -178,7 +178,7 @@ class QuarantineMediaTestCase(unittest.HomeserverTestCase): self.fetches = [] - def get_file(destination, path, output_stream, args=None, max_size=None): + async def get_file(destination, path, output_stream, args=None, max_size=None): """ Returns tuple[int,dict,str,int] of file length, response headers, absolute URI, and response code. @@ -192,7 +192,7 @@ class QuarantineMediaTestCase(unittest.HomeserverTestCase): d = Deferred() d.addCallback(write_to) self.fetches.append((d, destination, path, args)) - return make_deferred_yieldable(d) + return await make_deferred_yieldable(d) client = Mock() client.get_file = get_file |