diff options
| author | Erik Johnston <erik@matrix.org> | 2018-08-17 14:15:48 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-08-17 14:15:48 +0100 |
| commit | 782689bd408b7d291fef913a318e1a6dda6f13e1 (patch) | |
| tree | 50502568cd0b9966e8c42d48d8db5d6cdf73fe1c /tests/util/test_file_consumer.py | |
| parent | Split ProfileHandler into master and worker (diff) | |
| parent | Merge pull request #3708 from matrix-org/neilj/resource_Limit_block_event_cre... (diff) | |
| download | synapse-782689bd408b7d291fef913a318e1a6dda6f13e1.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_profiles
Diffstat (limited to 'tests/util/test_file_consumer.py')
| -rw-r--r-- | tests/util/test_file_consumer.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/util/test_file_consumer.py b/tests/util/test_file_consumer.py index 7ce5f8c258..e90e08d1c0 100644 --- a/tests/util/test_file_consumer.py +++ b/tests/util/test_file_consumer.py @@ -27,7 +27,6 @@ from tests import unittest class FileConsumerTests(unittest.TestCase): - @defer.inlineCallbacks def test_pull_consumer(self): string_file = StringIO() @@ -87,7 +86,9 @@ class FileConsumerTests(unittest.TestCase): producer = NonCallableMock(spec_set=["pauseProducing", "resumeProducing"]) resume_deferred = defer.Deferred() - producer.resumeProducing.side_effect = lambda: resume_deferred.callback(None) + producer.resumeProducing.side_effect = lambda: resume_deferred.callback( + None + ) consumer.registerProducer(producer, True) |